Merge remote-tracking branch 'kc/new/enh/bug_6716' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 13 Sep 2011 02:34:01 +0000 (14:34 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 13 Sep 2011 02:34:01 +0000 (14:34 +1200)

Trivial merge