Merge remote branch 'kc/new/bug_5370' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 8 Nov 2010 21:49:01 +0000 (10:49 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 8 Nov 2010 21:49:01 +0000 (10:49 +1300)

Trivial merge