Merge remote branch 'kc/new/bug_5595' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 13 Mar 2011 07:31:38 +0000 (20:31 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 13 Mar 2011 07:31:38 +0000 (20:31 +1300)

Trivial merge