Merging from trunk

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