Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
	ChangeLog

diff --cc ChangeLog
index eaa7b7e,4569518..4092e50
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,23 +1,28 @@@
 +2011-08-14  Ulrich Drepper  <drepper@gmail.com>
 +
 +      * nscd/servicescache.c (cache_addserv): Make sure written is always
 +      initialized.
 +
+ 2011-08-14  Roland McGrath  <roland@hack.frob.com>
+ 
+       * string/strncat.c (STRNCAT): Use prototype definition.
+ 
+       * locale/Makefile (locale-CPPFLAGS): Renamed CPPFLAGS-locale-programs.
+       (locale-CPPFLAGS): New variable; put LOCALEDIR, LOCALE_ALIAS_PATH and
+       -Iprograms here.
+       (cppflags-iterator.mk sequence): Use locale-programs in place of nonlib.
+       (localedef-modules): Add localedef.
+       (locale-modules): Add locale.
+ 
+       * sysdeps/generic/ldsodefs.h (struct unique_sym): Add a const.
+       * elf/rtld.c (dl_main): Invert order of assignment in last change,
+       to avoid a warning.
+ 
+ 2011-08-14  David S. Miller  <davem@davemloft.net>
+ 
+       * sysdeps/unix/sysv/linux/sparc/bits/resource.h (RLIM_INFINITY,
+       RLIM64_INFINITY): Fix 64-bit values for 32-bit sparc.
+ 
  2011-08-13  Ulrich Drepper  <drepper@gmail.com>
  
        * elf/dl-open.c: Rename show_scope to _dl_schow_scope and export.