Merging from trunk

svn path=/branches/release/libs/program_options/; revision=84745