Merge remote-tracking branch 'kc/new/enh/bug_6871' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 27 Sep 2011 20:51:05 +0000 (09:51 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 27 Sep 2011 20:51:05 +0000 (09:51 +1300)

Trivial merge