Clone
Andrew Dinn
committed
on 19 Feb 10
updating branch 1.2 from latest trunk