optional_optimization branch

svn path=/sandbox-branches/optional_optimization/tools/wave/; revision=77091