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

Trivial merge