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)
commitef087b000620b5c5d113a4cabe5b8c22c984b3f8
treeb63a9c86f548efba2e1b8e58d781fa27cbc0b416
parentae6ae0b39ddaff68d33a488a1ce2a3c5b2091efc
parentba35ce60e1cefbfa0cfbedaca218f46f2662310e
Merge remote branch 'kc/new/bug_4991' into kcmaster

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