Spirit: Merging from trunk

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