Also remove vgpreload_*.so from LD_PRELOAD when we're not tracing
children.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2132 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/vg_syscalls.c b/coregrind/vg_syscalls.c
index a213adc..cc829d5 100644
--- a/coregrind/vg_syscalls.c
+++ b/coregrind/vg_syscalls.c
@@ -1689,6 +1689,9 @@
 	 VG_(sprintf)(buf, "%s*/vg_inject.so", VG_(libdir));
 	 VG_(mash_colon_env)(ld_preload_str, buf);
 
+	 VG_(sprintf)(buf, "%s*/vgpreload_*.so", VG_(libdir));
+	 VG_(mash_colon_env)(ld_preload_str, buf);
+
 	 VG_(sprintf)(buf, "%s*", VG_(libdir));
 	 VG_(mash_colon_env)(ld_library_path_str, buf);