Merge branch 'new/enh/bug_5917' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 14 Apr 2011 01:36:57 +0000 (13:36 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 14 Apr 2011 01:36:57 +0000 (13:36 +1200)

Trivial merge