Merge remote-tracking branch 'kc/new/bug_6460' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 23 Sep 2011 22:03:08 +0000 (10:03 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 23 Sep 2011 22:03:08 +0000 (10:03 +1200)
commit6b9fff61fb7e96902c8d6afac906285bc1f4bb80
tree1716bb33757833fce41e5a258a39a791dc8f4094
parent061f2e9251bcfbb90b2babf3dee8a725b1295ba8
parenta746e11c1462df4567c007c8e73cf14a55af5ddb
Merge remote-tracking branch 'kc/new/bug_6460' into kcmaster