Spirit: Merging from trunk

svn path=/branches/release/boost/type_erasure/; revision=84640