Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 22 Sep 2011 23:34:28 +0000 (11:34 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 22 Sep 2011 23:34:28 +0000 (11:34 +1200)

Trivial merge