Sync w/ 3_6_BRANCH.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11564 a5019735-40e9-0310-863c-91ae7b9d1cf9
1 file changed