lars
committed
on 27 Feb 04
Fixed a few more merge problems