joela
committed
on 27 Feb 04
adjusted docs after merge