Merging from trunk

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