Merging from trunk

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