merge [82960] to release, fixes #7663

svn path=/branches/release/boost/bimap.hpp; revision=83381