optional_optimization branch

svn path=/sandbox-branches/optional_optimization/Jamroot; revision=77091