Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 13 Sep 2011 22:14:54 +0000 (10:14 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 13 Sep 2011 22:14:54 +0000 (10:14 +1200)

Trivial merge