emmar
committed
on 22 Jan 07
Merge from oacs-5-2 branch for lors-central