Merge remote branch 'kc/new/bug_5942' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 6 Apr 2011 03:35:16 +0000 (15:35 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 6 Apr 2011 03:35:16 +0000 (15:35 +1200)

Trivial merge