Merge remote branch 'kc/new/bug_6009' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 6 Apr 2011 07:28:54 +0000 (19:28 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 6 Apr 2011 07:28:54 +0000 (19:28 +1200)

Trivial merge