Merge remote-tracking branch 'kc/new/bug_5094' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 17 Jun 2011 03:07:18 +0000 (15:07 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 17 Jun 2011 03:07:18 +0000 (15:07 +1200)

Trivial merge