Merge remote-tracking branch 'kc/new/enh/bug_5263' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 3 Oct 2011 19:56:56 +0000 (08:56 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 3 Oct 2011 19:56:56 +0000 (08:56 +1300)

Trivial merge