diff --git a/ChangeLog b/ChangeLog
index e07d61d9..5fbc5ac0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-04-09-23  Gary V. Vaughan  <gary@gnu.org>
+2004-09-23  Gary V. Vaughan  <gary@gnu.org>
+
+	* m4/libtool.m4 (_LT_CMD_GLOBAL_SYMBOLS): Gah.  Merge error
+	corrected.
+
+2004-09-23  Gary V. Vaughan  <gary@gnu.org>
 
 	Since defs can change (path to grep for example) when it is made
 	for a different host, it can't be shipped.  That also means that
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index d2d87c1a..f5229b26 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -2726,12 +2726,6 @@ case `$NM -V 2>&1` in
   symcode='[[ABCDGIRSTW]]' ;;
 esac
 
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
 # Transform an extracted symbol line into a proper C declaration.
 # Some systems (esp. on ia64) link data and code symols differently,
 # so use this general approach.