lars
committed
on 29 Apr 04
Fixed bug introduced by merge