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

Trivial merge