Merge remote-tracking branch 'kc/new/bug_6712' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 28 Aug 2011 07:34:25 +0000 (19:34 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 28 Aug 2011 07:34:25 +0000 (19:34 +1200)

Trivial merge