Merge remote branch 'kc/new/bug_5227' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 4 Nov 2010 19:02:34 +0000 (08:02 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 4 Nov 2010 19:02:34 +0000 (08:02 +1300)

Trivial merge