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

Trivial merge