Merge remote branch 'kc/new/bug_5142' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 1 Dec 2010 20:04:09 +0000 (09:04 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 1 Dec 2010 20:04:09 +0000 (09:04 +1300)

Trivial merge