jeffd
committed
on 14 Jan 03
merge changes from 4.6