Merge remote-tracking branch 'kc/new/bug_6253' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 19 Oct 2011 20:23:36 +0000 (09:23 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 19 Oct 2011 20:23:36 +0000 (09:23 +1300)

Trivial merge