Merge remote branch 'kc/new/bug_4438' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 14 Mar 2011 07:48:50 +0000 (20:48 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 14 Mar 2011 07:48:50 +0000 (20:48 +1300)

Trivial merge