Merge remote-tracking branch 'kc/new/bug_5498' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 25 Aug 2011 00:07:49 +0000 (12:07 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 25 Aug 2011 00:07:49 +0000 (12:07 +1200)

Trivial merge