jeffd
committed
on 04 Oct 02
merge fix from 4-6 branch