Merge remote-tracking branch 'kc/new/bug_6497' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 19 Jun 2011 10:14:15 +0000 (22:14 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 19 Jun 2011 10:14:15 +0000 (22:14 +1200)

Trivial merge