MERGE TO STABLE CCMAIL: 68566-done@bugs.kde.org git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2048