One more failed merge

svn path=/branches/release/boost/algorithm/; revision=83192