Merge remote branch 'kc/master' into new/enh/bug_5579
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 19 Apr 2011 18:44:09 +0000 (06:44 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 19 Apr 2011 18:44:09 +0000 (06:44 +1200)

Trivial merge