Quickbook: Merge from trunk to quickbook-dev

svn path=/branches/quickbook-dev/libs/timer/; revision=75739
Quickbook: Merge from trunk.

svn path=/branches/quickbook-dev/libs/timer/; revision=77380