  {
     Int    i;
     HChar* xpre  = VG_(clo_xml) ? "  <line>" : "";
-@@ -999,9 +977,15 @@
+@@ -999,9 +993,15 @@
     UInt (*umsg_or_xml)( const HChar*, ... )
        = VG_(clo_xml) ? VG_(printf_xml) : VG_(umsg);
  

===================================================================
--- coregrind/m_main.c	(revision 10880)
+++ coregrind/m_main.c	(working copy)
@@ -313,6 +313,48 @@
    }
 }
 

    Int    i, tmp_log_fd, tmp_xml_fd;
    Int    toolname_len = VG_(strlen)(toolname);
    Char*  tmp_str;         // Used in a couple of places.
@@ -514,9 +570,13 @@
 
       else if VG_STR_CLO(arg, "--log-file", log_fsname_unexpanded) {
          log_to = VgLogTo_File;
