Merge units from the trunk.

svn path=/branches/release/boost/units/; revision=78342