diff -up Branch_4_2/testsuite/deprecated-build.xml.orig Branch_4_2/testsuite/deprecated-build.xml
--- Branch_4_2/testsuite/deprecated-build.xml.orig 2007-12-07 15:37:45.000000000 -0500
+++ Branch_4_2/testsuite/deprecated-build.xml 2007-12-07 15:37:50.000000000 -0500
@@ -7311,7 +7311,6 @@ marathon.threadcount: ${marathon.t
-
diff -up Branch_4_2/build/build-thirdparty.xml.orig Branch_4_2/build/build-thirdparty.xml
--- Branch_4_2/build/build-thirdparty.xml.orig 2007-12-07 15:44:45.000000000 -0500
+++ Branch_4_2/build/build-thirdparty.xml 2007-12-07 15:44:53.000000000 -0500
@@ -56,7 +56,6 @@
-
diff -up Branch_4_2/tools/etc/buildmagic/libraries.xml.orig Branch_4_2/tools/etc/buildmagic/libraries.xml
--- Branch_4_2/tools/etc/buildmagic/libraries.xml.orig 2007-12-07 15:45:24.000000000 -0500
+++ Branch_4_2/tools/etc/buildmagic/libraries.xml 2007-12-07 15:45:49.000000000 -0500
@@ -181,13 +181,6 @@
-
-
-
-
-
-
-
diff -up Branch_4_2/tools/etc/buildmagic/libraries.ent.orig Branch_4_2/tools/etc/buildmagic/libraries.ent
--- Branch_4_2/tools/etc/buildmagic/libraries.ent.orig 2007-12-07 15:46:01.000000000 -0500
+++ Branch_4_2/tools/etc/buildmagic/libraries.ent 2007-12-07 15:46:25.000000000 -0500
@@ -206,13 +206,6 @@
-
-
-
-
-
-
-