lars
committed
on 13 May 04
Merged over changes from dotlrn-2-0 branch