Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 14 Sep 2011 20:42:56 +0000 (08:42 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 14 Sep 2011 20:42:56 +0000 (08:42 +1200)

Trivial merge