Merge remote-tracking branch 'kc/new/bug_6696' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 28 Aug 2011 07:34:18 +0000 (19:34 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 28 Aug 2011 07:34:18 +0000 (19:34 +1200)
commit383d0d3a2108a0ebb784937addc85e7a854ea247
treec5fb6c0c29f0b9708421308cb36b3bba7d813721
parent3731ec80fc407ba4668450b48c9c81b8c0a98460
parenta94a9f745556d42e5018695dbaa70a72129cc993
Merge remote-tracking branch 'kc/new/bug_6696' into kcmaster