Merge remote-tracking branch 'kc/new/bug_6312' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 15 May 2011 08:38:00 +0000 (20:38 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 15 May 2011 08:38:00 +0000 (20:38 +1200)

Trivial merge