Merge remote branch 'kc/new/bug_5448' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 1 Dec 2010 19:52:49 +0000 (08:52 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 1 Dec 2010 19:52:49 +0000 (08:52 +1300)

Trivial merge