diff --git a/ChangeLog b/ChangeLog
index dd93bf5e3b..ec2d48de32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2004-08-16  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkwidget.c (gtk_widget_render_icon): Doc update.
@@ -11,6 +10,9 @@
 
 2004-08-16  Morten Welinder  <terra@gnome.org>
 
+	* tests/testtreemodel.c (test_run): Comment out mallinfo stuff.
+	Fix g_print %-strings.
+
 	* gtk/gtksequence.c (_gtk_sequence_set): Fix C99ism.
 
 2004-08-16  Christian Rose  <menthos@menthos.com>
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index dd93bf5e3b..ec2d48de32 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2004-08-16  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkwidget.c (gtk_widget_render_icon): Doc update.
@@ -11,6 +10,9 @@
 
 2004-08-16  Morten Welinder  <terra@gnome.org>
 
+	* tests/testtreemodel.c (test_run): Comment out mallinfo stuff.
+	Fix g_print %-strings.
+
 	* gtk/gtksequence.c (_gtk_sequence_set): Fix C99ism.
 
 2004-08-16  Christian Rose  <menthos@menthos.com>
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index dd93bf5e3b..ec2d48de32 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2004-08-16  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkwidget.c (gtk_widget_render_icon): Doc update.
@@ -11,6 +10,9 @@
 
 2004-08-16  Morten Welinder  <terra@gnome.org>
 
+	* tests/testtreemodel.c (test_run): Comment out mallinfo stuff.
+	Fix g_print %-strings.
+
 	* gtk/gtksequence.c (_gtk_sequence_set): Fix C99ism.
 
 2004-08-16  Christian Rose  <menthos@menthos.com>
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index dd93bf5e3b..ec2d48de32 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2004-08-16  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkwidget.c (gtk_widget_render_icon): Doc update.
@@ -11,6 +10,9 @@
 
 2004-08-16  Morten Welinder  <terra@gnome.org>
 
+	* tests/testtreemodel.c (test_run): Comment out mallinfo stuff.
+	Fix g_print %-strings.
+
 	* gtk/gtksequence.c (_gtk_sequence_set): Fix C99ism.
 
 2004-08-16  Christian Rose  <menthos@menthos.com>
diff --git a/tests/testtreemodel.c b/tests/testtreemodel.c
index 85e04a17b8..0ef4617d3b 100644
--- a/tests/testtreemodel.c
+++ b/tests/testtreemodel.c
@@ -191,7 +191,7 @@ test_run (gchar        *title,
   gchar *text;
   GTimer *timer;
   gdouble elapsed;
-  int uordblks_before;
+  int uordblks_before, memused;
 
   g_print ("%s (average over %d runs, time in milliseconds)\n"
 	   "items \ttime      \ttime/item \tused memory\n", title, repeats);
@@ -205,7 +205,10 @@ test_run (gchar        *title,
       for (d = 0; d < repeats; d++)
 	{
 	  (*clear)(store);
+#ifdef HAVE_MALLINFO
+	  /* Peculiar location of this, btw.  -- MW.  */
 	  uordblks_before = mallinfo().uordblks;
+#endif
 	  g_timer_reset (timer);
 	  g_timer_start (timer);
 	  for (i = 0; i < items; i++)
@@ -215,8 +218,13 @@ test_run (gchar        *title,
 	}
       
       elapsed = elapsed * 1000 / repeats;
-      g_print ("%d \t%lf \t%lf  \t%ldk\n", 
-	       items, elapsed, elapsed/items, (mallinfo().uordblks - uordblks_before) / 1024);
+#ifdef HAVE_MALLINFO
+      memused = (mallinfo().uordblks - uordblks_before) / 1024;
+#else
+      memused = 0;
+#endif
+      g_print ("%d \t%f \t%f  \t%dk\n", 
+	       items, elapsed, elapsed/items, memused);
     }  
 }