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

Trivial merge