Merge remote-tracking branch 'kc/new/enh/bug_5579' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 27 May 2011 08:28:12 +0000 (20:28 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 27 May 2011 08:28:12 +0000 (20:28 +1200)

Trivial merge