Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 26 Sep 2011 10:14:36 +0000 (23:14 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 26 Sep 2011 10:14:36 +0000 (23:14 +1300)

Trivial merge