Merging from trunk

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