heap: merge fixes from trunk

[SVN r85437]
This commit is contained in:
Tim Blechmann 2013-08-23 18:01:11 +00:00
parent ae678777d1
commit 179bdd9dcf

@ -1 +1 @@
Subproject commit c226504e4d3d8a63f22d7cd90a0f82b137d062c5
Subproject commit 5fd82a9d3fe76b87f34f2218f1c7368c56e9d9fc