Merge remote branch 'kc/master' into new/enh/bug_5917
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 23 Mar 2011 06:50:02 +0000 (19:50 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 23 Mar 2011 06:50:02 +0000 (19:50 +1300)

Trivial merge