Merge remote branch 'kc/new/bug_5611' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 12 Jan 2011 19:19:46 +0000 (08:19 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 12 Jan 2011 19:19:46 +0000 (08:19 +1300)
commit2390b4e1dc442d5280eab763a72b7cbd10680669
tree0ff497610bc90e76785241953722ca01ba28d9e4
parent3153abe61b441ee8b4088c9b13f2954c63546cab
parentbe37db49fb329f8911dabb0d12d2a6e09bb9dc91
Merge remote branch 'kc/new/bug_5611' into kcmaster