Merge remote branch 'kc/new/bug_3326' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 16 Mar 2011 20:22:46 +0000 (09:22 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 16 Mar 2011 20:22:46 +0000 (09:22 +1300)

Trivial merge