Merge branch 'master' of ssh://sources.redhat.com/git/glibc

diff --cc ChangeLog
index 0d3d04a,bdbf33b..e379606
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,9 +1,13 @@@
+ 2010-05-05  Andreas Schwab  <schwab@redhat.com>
+ 
+       * INSTALL: Regenerate.
+ 
  2010-05-05  Ulrich Drepper  <drepper@redhat.com>
  
 +      [BZ #11571]
 +      * sysdeps/unix/sysv/linux/getlogin_r.c (__getlogin_r_loginuid): Handle
 +      too small buffers according to the standard.
 +
        * sysdeps/unix/sysv/linux/kernel-features.h: Alpha doesn't have to be
        handled here anymore.
        Patch mostly by Matt Turner <mattst88@gmail.com>.