Finalise for 1.9.6.

MERGE TO STABLE


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1618 a5019735-40e9-0310-863c-91ae7b9d1cf9
2 files changed