Merge remote-tracking branch 'kc/new/bug_6094' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 20 Oct 2011 15:32:31 +0000 (04:32 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 20 Oct 2011 15:32:31 +0000 (04:32 +1300)
commit05c2f83817ab41a5d4f876395b6a560d0e83de29
treef4949798596f8faa33dcfb48b3cd2449e7bc7789
parent769acee41ae258ea4efb0114eb7995736496a9cf
parentc56d12c721684bfd3bac0e9bd9cf17f8f29651a9
Merge remote-tracking branch 'kc/new/bug_6094' into kcmaster