heap: merge changes from trunk


svn path=/branches/release/boost/heap/; revision=83541