Spirit: Merging from trunk

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