Quickbook: Merge from trunk to quickbook-dev.

svn path=/branches/quickbook-dev/libs/units/; revision=75846