Merge remote branch 'kc/new/enh/bug_5917' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 17 Apr 2011 23:45:47 +0000 (11:45 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 17 Apr 2011 23:45:47 +0000 (11:45 +1200)

Trivial merge