jeffd
committed
on 15 Jan 03
merge changes from 4.6