diff --git a/ChangeLog b/ChangeLog
index 2785d078c..9b9231f40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,17 @@
+<<<<<<< .mine
+2010-06-28  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSSet.m: Fix incorrect return value in NSMutableSet's
+	-classForCoder method.
+
+=======
 2010-06-28  Quentin Mathe <quentin.mathe@gmail.com>
 
 	* Tools/autogsdoc.m: Improved to search for .m files among the 
 	command-line arguments in addition to the current directory and 
 	documentation directory.
 
+>>>>>>> .r30877
 2010-06-26  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSObject.m: Remove the Object(NSObjectCompat) category as the
diff --git a/Source/NSSet.m b/Source/NSSet.m
index 5c999e844..1c05fcad8 100644
--- a/Source/NSSet.m
+++ b/Source/NSSet.m
@@ -946,7 +946,7 @@ static Class NSMutableSet_concrete_class;
 
 - (Class) classForCoder
 {
-  return NSMutableSet_concrete_class;
+  return NSMutableSet_abstract_class;
 }
 
 /** <init /> <override-subclass />
diff --git a/Tools/gdomap.c b/Tools/gdomap.c
index 95bce95e8..c863b6540 100644
--- a/Tools/gdomap.c
+++ b/Tools/gdomap.c
@@ -3960,7 +3960,7 @@ nameServer(const char* name, const char* host, int op, int ptype, struct sockadd
    */
   if (host && host[0] == '*' && host[1] == '\0')
     {
-	multi = 1;
+      multi = 1;
     }
   /*
    *	If no host name is given, we use the name of the local host.
@@ -4073,10 +4073,10 @@ nameServer(const char* name, const char* host, int op, int ptype, struct sockadd
       if (op == GDO_REGISTER)
 	{
 	  port = (unsigned short)pnum;
-	  if (port == 0)
+	  if (port == 0 || htons(port) == p)
 	    {
 	      snprintf(ebuf, sizeof(ebuf),
-	        "attempted registration with bad port.");
+	        "attempted registration with bad port (%d).", port);
 	      gdomap_log(LOG_ERR);
 	      return -1;
 	    }