Merge remote branch 'kc/new/bug_4979' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 12 Nov 2010 17:47:45 +0000 (06:47 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 12 Nov 2010 17:47:45 +0000 (06:47 +1300)

Trivial merge