Barry LaFond
committed
on 30 Nov 10
Merging 7.1 branch into trunk