lars
committed
on 02 Mar 04
Back-merging bug fix from HEAD