Merge in changes from the 2.4.0 line.  This basically brings in the
overhaul of the thread support.  Many things are now probably broken,
but at least with --tool=none, simple and not-so-simple threaded and
non-thread programs work.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3265 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/vg_default.c b/coregrind/vg_default.c
index f88fe75..9e3ffff 100644
--- a/coregrind/vg_default.c
+++ b/coregrind/vg_default.c
@@ -88,7 +88,7 @@
 }
 
 __attribute__ ((weak))
-void  TL_(free)( ThreadId tid, void* p )
+void TL_(free)( ThreadId tid, void* p )
 {
    /* see comment for TL_(malloc)() above */
    if (VG_(tl_malloc_called_by_scheduler))