andrewg
committed
on 20 May 05
Merging in changes from oacs-5-1. Please see comments for 1.70.2.8.