Merge remote branch 'kc/new/bug_3009' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 9 Feb 2011 02:27:01 +0000 (15:27 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 9 Feb 2011 02:27:01 +0000 (15:27 +1300)

Trivial merge