Merge remote branch 'kc/new/enh/bug_5551' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 23 Jan 2011 18:24:40 +0000 (07:24 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 23 Jan 2011 18:24:40 +0000 (07:24 +1300)

Trivial merge