merged from trunk

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