Merge remote-tracking branch 'kc/new/enh/bug_4877' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 16 Sep 2011 01:53:40 +0000 (13:53 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 16 Sep 2011 01:53:40 +0000 (13:53 +1200)

Trivial merge