Merging from trunk

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