Merge remote-tracking branch 'kc/new/bug_5234' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 13 Sep 2011 20:46:05 +0000 (08:46 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 13 Sep 2011 20:46:05 +0000 (08:46 +1200)

Trivial merge