Merge remote branch 'kc/new/bug_5236' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 8 Nov 2010 02:26:37 +0000 (15:26 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 8 Nov 2010 02:26:37 +0000 (15:26 +1300)

Trivial merge