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

Trivial merge