Quickbook: Merge from trunk to quickbook-dev.

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