Merge remote-tracking branch 'kc/new/bug_6726' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 26 Aug 2011 03:01:09 +0000 (15:01 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 26 Aug 2011 03:01:09 +0000 (15:01 +1200)

Trivial merge