Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 26 Sep 2011 19:22:32 +0000 (08:22 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 26 Sep 2011 19:22:32 +0000 (08:22 +1300)
commit944831555e89c8fdb4dc865764de51887a98a23b
tree22459be06fa1e476f69b6b9eeffbc0fcd2bf4515
parentcac6eb12502f82ed5a0b59a74cf84fa009ba0a26
parent05d9510ca91016a78db38cf7bec0bb4a2ea46480
Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster