ryang
committed
on 18 Sep 11
Fixes for oacs-5-7 compatibility