Merging from trunk

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