Merge remote branch 'kc/new/enh/bug_5733' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 13 Feb 2011 20:29:19 +0000 (09:29 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 13 Feb 2011 20:29:19 +0000 (09:29 +1300)

Trivial merge