004.08 Pulled in changes from rob branch -Support OPTIMIZATION=s on the make line.