Merge remote branch 'kc/new/bug_4498' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sat, 13 Nov 2010 20:42:23 +0000 (09:42 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sat, 13 Nov 2010 20:42:23 +0000 (09:42 +1300)

Trivial merge