Fix another merge-related problem.  I think this may resolve the
thread-hang-at-exit issues.



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