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)
commit5145eb59b786bd2010eb324197034dd210504543
treebc0b5979e42aeddd02b427dc871d2be4e361143e
parentef087b000620b5c5d113a4cabe5b8c22c984b3f8
parent8640007ca030dc3800401c84e9d973de01be4b2f
Merge remote branch 'kc/new/merge_help' into kcmaster

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>