From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 4 Mar 2008 18:36:27 +0000 (+0000)
Subject: [BZ #5736]
X-Git-Tag: cvs/fedora-glibc-20080305T0857~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c958a6a4e50ac7ca8d72e518825a474d17850119;p=thirdparty%2Fglibc.git

[BZ #5736]

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

diff --git a/ChangeLog b/ChangeLog
index c76cdd7a419..f3ebffb8174 100644
--- 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 2a35fc65c38..342f49c9116 100644
--- 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 e00eb0f4e20..7610aa444a6 100644
--- 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);