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

Conflicts:
	ChangeLog

diff --cc ChangeLog
index fe82103,33c7c9d..cfb381a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,8 +1,13 @@@
 +2011-10-30  Marek Polacek  <mpolacek@redhat.com>
 +
 +      * libio/wfileops.c (_IO_wfile_underflow_mmap): Remove unused variable.
 +      * sysdeps/ieee754/dbl-64/mpsqrt.c (__mpsqrt): Likewise.
 +
+ 2011-11-11  Roland McGrath  <roland@hack.frob.com>
+ 
+       * include/unistd.h: Fix __readlink return type.
+       Reported by Chris Metcalf <cmetcalf@tilera.com>.
+ 
  2011-11-11  Ulrich Drepper  <drepper@gmail.com>
  
        * stdlib/ucontext.h: Undo last change for makecontext.