Merge remote branch 'kc/new/bug_5611' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 12 Jan 2011 19:19:46 +0000 (08:19 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 12 Jan 2011 19:19:46 +0000 (08:19 +1300)

Trivial merge