Tom Fennelly
committed
on 13 Aug 08
Merges from the 4.4 CP branch