Merge in the DATASYMS branch.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7540 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/exp-drd/drd_error.h b/exp-drd/drd_error.h
index 6607366..1ef243e 100644
--- a/exp-drd/drd_error.h
+++ b/exp-drd/drd_error.h
@@ -71,7 +71,7 @@
    OffT        rwoffset;      //   ALL
    ExeContext* lastchange;    //   Mallocd
    DrdThreadId stack_tid;     //   Stack
-   SegInfo*    seginfo;       //   Segment
+   DebugInfo*  debuginfo;     //   Segment
    Char        name[256];     //   Segment
    Char        descr[256];    //   Segment
 }