Barry LaFond
committed
on 07 Dec 10
Merging 7.1 branch changes into trunk