Spirit: Merging from trunk

svn path=/branches/release/boost/optional.hpp; revision=84640