Merge remote branch 'kc/new/bug_4305' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 11 Nov 2010 21:47:38 +0000 (10:47 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 11 Nov 2010 21:47:38 +0000 (10:47 +1300)
commit061e05ca97e58009753c95c57706c48ce28e86aa
tree1f7e0818cf7081d4ddaa654bfc5c7043e3a3a135
parentbd0e9e92a9d272f21b6627b1ff106595ebd55224
parent9c6db56a3f807c819be5e724f423a212fa4b362c
Merge remote branch 'kc/new/bug_4305' into kcmaster