Merge remote-tracking branch 'kc/new/bug_2505' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 11 Jul 2011 09:09:25 +0000 (21:09 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 11 Jul 2011 09:09:25 +0000 (21:09 +1200)

Trivial merge