Merging from trunk

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