Merge remote branch 'kc/new/bug_4991' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 3 Nov 2010 01:48:37 +0000 (14:48 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 3 Nov 2010 01:49:13 +0000 (14:49 +1300)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Trivial merge