Merge remote branch 'kc/new/bug_5327' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 18 Jan 2011 03:25:58 +0000 (16:25 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 18 Jan 2011 03:25:58 +0000 (16:25 +1300)

Trivial merge