Merging from trunk

svn path=/branches/release/libs/numeric/ublas/; revision=84745