Merge remote branch 'kc/new/bug_5240' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 9 Jan 2011 20:16:50 +0000 (09:16 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 9 Jan 2011 20:16:50 +0000 (09:16 +1300)
commita75a9264e19fe658f475c8a8ee40e0b1ca53dbd2
tree430911a3ef7aa6f7adbf59d41363f71d4407009d
parentc0441ebbfb547507cda86c8c05575d88761045e1
parent88a15a71d5fd874acf06b3f73e567ac07b2e785b
Merge remote branch 'kc/new/bug_5240' into kcmaster