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

Trivial merge