Merge Wave fixes

svn path=/branches/release/boost/wave/; revision=83464