diff --git a/ChangeLog b/ChangeLog
index 733b4e4d21..77af3ec1f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-08-21  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #4582]
+	* debug/segfault.c: Fix typos in comments.
+
 	[BZ #4588]
 	* stdio-common/tempnam.c: Fix comment, it is not checked that
 	TMPDIR points to a writable directory.
diff --git a/debug/segfault.c b/debug/segfault.c
index f141fff661..413f207207 100644
--- a/debug/segfault.c
+++ b/debug/segfault.c
@@ -1,5 +1,5 @@
 /* Catch segmentation faults and print backtrace.
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2007
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
@@ -42,7 +42,7 @@
 /* Get code to possibly dump the content of all registers.  */
 #include <register-dump.h>
 
-/* We'll use tis a lot.  */
+/* We'll use this a lot.  */
 #define WRITE_STRING(s) write (fd, s, strlen (s))
 
 /* Name of the output file.  */
@@ -67,7 +67,7 @@ write_strsignal (int fd, int signal)
 
 
 /* This function is called when a segmentation fault is caught.  The system
-   is in an instable state now.  This means especially that malloc() might
+   is in an unstable state now.  This means especially that malloc() might
    not work anymore.  */
 static void
 catch_segfault (int signal, SIGCONTEXT ctx)
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index d27b6d7538..63114d30fa 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-22  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #4557]
+	* locales/as_IN: Change <UNASSIGNED-09CE> to <U09CE>.
+
 2007-08-03  Jakub Jelinek  <jakub@redhat.com>
 
 	* locales/translit_combining: Add U0141 and U0142.
diff --git a/localedata/locales/as_IN b/localedata/locales/as_IN
index d3c779b7a6..c61ba30460 100644
--- a/localedata/locales/as_IN
+++ b/localedata/locales/as_IN
@@ -596,7 +596,7 @@ order_start forward;forward;forward;forward
 <U09CC> <X689A>;<X0005>;<X0005>;IGNORE
 <U09CD> <X689C>;<X0005>;<X0005>;IGNORE
 <U09D7> <X689E>;<X0005>;<X0005>;IGNORE
-<UNASSIGNED-09CE> "<XE2E9><X6B20>";<X0005>;"<X0005><X00C0>";IGNORE
+<U09CE> "<XE2E9><X6B20>";<X0005>;"<X0005><X00C0>";IGNORE
 UNDEFINED IGNORE;IGNORE;IGNORE;%...
 
 order_end
diff --git a/string/strtok.c b/string/strtok.c
index f45b760f74..9d6bb06779 100644
--- a/string/strtok.c
+++ b/string/strtok.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991,1996,1997,1999,2000,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1996,1997,1999,2000,2001,2007
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -30,7 +31,7 @@ static char *olds;
 	x = strtok(s, "-");		// x = "abc"
 	x = strtok(NULL, "-=");		// x = "def"
 	x = strtok(NULL, "=");		// x = NULL
-		// s = "abc\0-def\0"
+		// s = "abc\0=-def\0"
 */
 char *
 strtok (s, delim)