Merge remote branch 'kc/new/bug_5940' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 30 Mar 2011 06:40:47 +0000 (19:40 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 30 Mar 2011 06:40:47 +0000 (19:40 +1300)
commitc12660a4b3e49383cc3dc9e4953aa6d88b1a26d5
treeaaddafdd6e7b2260f6d74088bb6a16a74e7b3ec2
parent5a89ef7ea5733ba8c8ff4c49efebb3ab8d760eda
parentf144af1a958acb36cf7bbf2b745e62a4656913d0
Merge remote branch 'kc/new/bug_5940' into kcmaster