Merging from trunk

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