Merge remote branch 'kc/new/bug_5386' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 11 Nov 2010 17:41:25 +0000 (06:41 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 11 Nov 2010 17:41:25 +0000 (06:41 +1300)

Trivial merge