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

Trivial merge