Fixed a conflict by commenting out a line added by Malte. Will e-mail himfor better resolution if needed (the var set in that line is set with a newvalue before it is ever used).
Picked up some changes missed by the join of oacs-5-2 and oacs-5-3. It turnsout the cvs won't join files if it has already done some merging previously.In this case I'd previously merged oacs-5-2 to HEAD, then branched oacs-5-3, thenreopened the 5.2 branch for minor bug fixing for .LRN 2.2.1. This confusedCVS or ... at least made it stubborn.