Merge remote branch 'kc/new/bug_6187' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 14 Apr 2011 22:28:55 +0000 (10:28 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 14 Apr 2011 22:28:55 +0000 (10:28 +1200)
commit9d6fbefce6c0bb3b6fbe024c9c30e7321ef92c4a
tree322170313a9f6a936a7d5d9eeef92cb41db207f5
parentd44896079b2c8619b120cda789de717fa77bfeea
parent12e15ebb617636791fdc7b2a3b2ae8dc90cf4367
Merge remote branch 'kc/new/bug_6187' into kcmaster