Merging from trunk

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