yon
committed
on 25 Jun 02
some more porting of stuff