[BZ #5736]

	* malloc/malloc.c: Fix typo in comment.

diff --git a/ChangeLog b/ChangeLog
index c76cdd7a419b457daeed3fd69ac574acfe09771f..f3ebffb8174b1ce2fe8eca47388e66f8fdc9c3d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-03-04  Ulrich Drepper  <drepper@redhat.com>
 
+       [BZ #5736]
+       * malloc/malloc.c: Fix typo in comment.
+
        [BZ #5627]
        * locale/iso-639.def: Add Shuswap.
 

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 2a35fc65c381b96753ad62111ca38ec5dd8f1113..342f49c9116497dc49b7375d30a40c55de7743e4 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,13 @@
+2008-03-04  Ulrich Drepper  <drepper@redhat.com>
+
+       * locales/en_CA: Add language information in LC_ADDRESS section.
+       * locales/fr_CA: Likewise.
+       * locales/ik_CA: Likewise.
+       * locales/iu_CA: Likewise.
+
+       [BZ #5627]
+       * locales/shs_CA: New file.
+
 2008-01-10  Ulrich Drepper  <drepper@redhat.com>
 
        [BZ #5520]

diff --git a/malloc/malloc.c b/malloc/malloc.c
index e00eb0f4e2072f22527bc6212dee5a6dbb37dd47..7610aa444a66f63d28c9872379a6e60f786a1ba0 100644 (file)
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1186,7 +1186,7 @@ void     public_cFREe();
 
   Malloc_trim returns 1 if it actually released any memory, else 0.
   On systems that do not support "negative sbrks", it will always
-  rreturn 0.
+  return 0.
 */
 #if __STD_C
 int      public_mTRIm(size_t);