Merging from trunk

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