Merge remote branch 'kc/new/enh/bug_5628' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 20 Jan 2011 20:20:41 +0000 (09:20 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 20 Jan 2011 20:20:41 +0000 (09:20 +1300)

Trivial merge