daveb
committed
on 22 Nov 02
merge fixes into 4.6 branch