Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 12 Sep 2011 21:36:13 +0000 (09:36 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 12 Sep 2011 21:36:13 +0000 (09:36 +1200)

Trivial merge