donb
committed
on 16 May 02

Fixed up a merge mess ...