peterm
committed
on 26 Apr 03
full merge from the oacs-4-6 branch up until version 1.19.2.13