Merging from trunk

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