Merge remote branch 'kc/new/bug_5030' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 1 Dec 2010 20:20:14 +0000 (09:20 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 1 Dec 2010 20:20:14 +0000 (09:20 +1300)
commit00408e262fbe58f4c6a3fbb722a0cb56d3d22f6c
treeedf8b9247b031fe88fd480d96457ccacc90a7672
parent0287080cdcea7edafd836967c58fe754c88cf1ea
parent9f0495238de31cbdcacabe8f3986081f150ae2cb
Merge remote branch 'kc/new/bug_5030' into kcmaster