Merge remote branch 'kc/new/bug_6065' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 6 Apr 2011 04:16:30 +0000 (16:16 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 6 Apr 2011 04:16:30 +0000 (16:16 +1200)
commit99160747f48e591b482a3fcd7844d11b57f1e8db
treecfe098800cc2ab34758529eab7a067c697458a2c
parent96f054e90d4a582b13f1f6d2922b4ae99999a23d
parent2a28b30a3c5a02475d59d4beab9c3b67cfc666e3
Merge remote branch 'kc/new/bug_6065' into kcmaster