daveb
committed
on 30 Dec 02
more conlict markers cleaned up, sorry