Spirit: Merging from trunk

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