Merge remote branch 'kc/new/bug_5066' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 17 Nov 2010 20:43:25 +0000 (09:43 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 17 Nov 2010 20:43:25 +0000 (09:43 +1300)
commit6ea5246661fa5e6f172c60cdec86b2a6e9e49e9d
treeeb2cbc572d60af31bcb808b3037a463deda2687b
parentc55f8ffca7337587a746ae6dda30d9c6508e3da7
parent1bd67e28e563c00d270686f89ceecdeb93230f36
Merge remote branch 'kc/new/bug_5066' into kcmaster