[boost] boost/optional/optional.hpp suspicious unmerged changes

Could someone check this file out to make sure all the right changes have been merged from 1.34.0 into trunk? Thanks, -- Dave Abrahams Boost Consulting http://www.boost-consulting.com