lars
committed
on 13 Mar 03
Merged over changes from HEAD