diff --git a/glib/ChangeLog b/glib/ChangeLog
index c5a177b325..1d39619b45 100644
--- a/glib/ChangeLog
+++ b/glib/ChangeLog
@@ -1,3 +1,37 @@
+Fri Jan  9 20:03:46 1998  Tim Janik  <timj@psynet.net>
+
+	* gutils.c (g_strerror): changed message for EAGAIN from
+	"no more processes" to "try again" since EAGAIN is used with
+	functions else than fork().
+
+	* gscanner.c (g_scanner_get_token_ll): use strtol() instead of
+	strtoul() to avoid conflicts with solaris.
+
+	* merged the glib portions from Jan 2 to Jan 7 out of gtk+/ChangeLog
+ 	into this file.
+
+Wed Jan  7 02:14:30 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* glib.h:
+	* glist.c:
+	* gslist.c:
+	* testglib.c: Added g_[s]list_insert_sorted function
+	and appropriate tests in testglib
+
+Sat Jan  3 20:23:25 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* glib.h: Changed guint32 -> guint for bitfields.
+	(Bitfields must be int or unsigned int?)
+
+Fri Jan  2 23:52 PST 1998 Jay Painter <jpaint@serv.net>
+
+	* glib_pre1.h: 
+	* glib_pre2.h: 
+	* glib.h: reverted glibconfig.h and glib.h files back to the
+	way they were before my ugly hack.
+
+	* gscanner.c: removed inlines from clist and gscanner
+
 Tue Dec 23 02:49:51 1997  Tim Janik  <timj@psynet.net>
 
 	* gscanner.c: new file for GScanner: Flexible lexical scanner for
diff --git a/glib/gscanner.c b/glib/gscanner.c
index 35b81b7f8c..3c4daac330 100644
--- a/glib/gscanner.c
+++ b/glib/gscanner.c
@@ -957,15 +957,15 @@ g_scanner_get_token_ll	(GScanner	*scanner,
 	switch (token)
 	  {
 	  case	G_TOKEN_BINARY:
-	    value.v_binary = strtoul (gstring->str, &endptr, 2);
+	    value.v_binary = strtol (gstring->str, &endptr, 2);
 	    break;
 	    
 	  case	G_TOKEN_OCTAL:
-	    value.v_octal = strtoul (gstring->str, &endptr, 8);
+	    value.v_octal = strtol (gstring->str, &endptr, 8);
 	    break;
 	    
 	  case	G_TOKEN_INT:
-	    value.v_int = strtoul (gstring->str, &endptr, 10);
+	    value.v_int = strtol (gstring->str, &endptr, 10);
 	    break;
 	    
 	  case	G_TOKEN_FLOAT:
@@ -973,7 +973,7 @@ g_scanner_get_token_ll	(GScanner	*scanner,
 	    break;
 	    
 	  case	G_TOKEN_HEX:
-	    value.v_hex = strtoul (gstring->str, &endptr, 16);
+	    value.v_hex = strtol (gstring->str, &endptr, 16);
 	    break;
 	    
 	  default:
diff --git a/glib/gutils.c b/glib/gutils.c
index b63a938969..c5dc9965ec 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -149,7 +149,7 @@ g_strerror (gint errnum)
     case EAFNOSUPPORT: return "address family not supported by protocol family";
 #endif
 #ifdef EAGAIN
-    case EAGAIN: return "no more processes";
+    case EAGAIN: return "try again";
 #endif
 #ifdef EALIGN
     case EALIGN: return "EALIGN";