Merge, from branches/COMEM, revisions 2568 to 2641.


git-svn-id: svn://svn.valgrind.org/vex/trunk@2642 8f6e269a-dfd6-0310-a8e1-e2731360e62c