Merging from trunk

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