andrewg
committed
on 15 Jun 04
Merging fix from oacs-5-1 branch onto HEAD