Merging from trunk

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