Merge remote branch 'kc/new/bug_5327' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 17 Jan 2011 20:41:53 +0000 (09:41 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 17 Jan 2011 20:41:53 +0000 (09:41 +1300)

Trivial merge