Merge remote-tracking branch 'kc/new/bug_6205' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 25 Sep 2011 08:23:21 +0000 (21:23 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 25 Sep 2011 08:23:21 +0000 (21:23 +1300)

Trivial merge