merged from trunk

svn path=/branches/proto/v4/boost/units/; revision=46303
note 46445 has been merged

svn path=/branches/proto/v4/boost/units/; revision=47981
merged from trunk

svn path=/branches/proto/v4/libs/units/; revision=47983
merged from trunk

svn path=/branches/proto/v4/boost/units/; revision=47991
merged from trunk

svn path=/branches/proto/v4/boost/units/; revision=48028
merged from trunk

svn path=/branches/proto/v4/libs/units/; revision=48062
merged from trunk

svn path=/branches/proto/v4/boost/units/; revision=48076
merged from trunk

svn path=/branches/proto/v4/boost/units/; revision=48080
merged from trunk

svn path=/branches/proto/v4/boost/units/; revision=48169
merged from trunk

svn path=/branches/proto/v4/libs/units/; revision=48605
merged from trunk

svn path=/branches/proto/v4/boost/units/; revision=48673
merged from trunk

svn path=/branches/proto/v4/boost/units/; revision=48781
merged from trunk

svn path=/branches/proto/v4/boost/units/; revision=48896
merged from trunk

svn path=/branches/proto/v4/boost/units/; revision=48916
merged from trunk

svn path=/branches/proto/v4/boost/units/; revision=49133
merged from trunk

svn path=/branches/proto/v4/boost/units/; revision=49439
merged from trunk

svn path=/branches/proto/v4/libs/units/; revision=49607