Merge remote branch 'kc/new/bug_5143' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 20 Dec 2010 00:24:40 +0000 (13:24 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 20 Dec 2010 00:24:40 +0000 (13:24 +1300)
commit8fe46f3dc1a3250b04a0da2f6dd9335710b4e702
treee1674ecdebbd63c7cfb3457020593e89f11c03e4
parent3c19f22f8625105715f9ba5f4fca2b0502bcd9cc
parentc25aaf1ca49c2733c22325057037dd5e14e0cfd8
Merge remote branch 'kc/new/bug_5143' into kcmaster