Merge remote branch 'kc/new/bug_5066' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 17 Nov 2010 20:43:25 +0000 (09:43 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 17 Nov 2010 20:43:25 +0000 (09:43 +1300)

Trivial merge