Merge remote branch 'kc/new/bug_6104' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 14 Apr 2011 06:30:38 +0000 (18:30 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 14 Apr 2011 06:30:38 +0000 (18:30 +1200)

Trivial merge