Merge from trunk

svn path=/branches/bcbboost/boost/algorithm/; revision=39533
Merge from trunk

svn path=/branches/bcbboost/boost/algorithm/; revision=39594