Merge remote-tracking branch 'kc/new/bug_6390' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 17 Oct 2011 20:45:39 +0000 (09:45 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 17 Oct 2011 20:45:39 +0000 (09:45 +1300)

Trivial merge