danw
committed
on 13 Apr 01
fixed up some incompatiblities