Merge remote branch 'kc/new/bug_4498' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sat, 13 Nov 2010 20:42:23 +0000 (09:42 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sat, 13 Nov 2010 20:42:23 +0000 (09:42 +1300)
commit1edf825fa1e439b2ced523e22174ad1e6d8971bc
tree9a7b27eadb66330363ccc58dcd009438cb092cbe
parent4cef5ec9611cc2fbbd245472b60e1580f6f8b4b5
parentd9de6ebab3ecca5e967c658541c0ec62db0ae2e7
Merge remote branch 'kc/new/bug_4498' into kcmaster