Merge remote branch 'kc/new/bug_5105' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 11 Nov 2010 08:33:48 +0000 (21:33 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 11 Nov 2010 08:33:48 +0000 (21:33 +1300)

Trivial merge