Spirit: Merging from trunk

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