Merge remote-tracking branch 'kc/new/bug_6256' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 8 Sep 2011 01:36:51 +0000 (13:36 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 8 Sep 2011 01:36:51 +0000 (13:36 +1200)

Trivial merge