Update mergeinfo. r14606 wasn't a proper svn merge. It was just an
applied patch.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14608 a5019735-40e9-0310-863c-91ae7b9d1cf9