daveb
committed
on 25 Oct 05
Merge 5.2 to HEAD