Merging from trunk

svn path=/branches/release/libs/units/; revision=84745