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

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 06a002e,a3000b5..7b25c3f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,7 +1,18 @@@
 +2010-06-14  Ulrich Drepper  <drepper@redhat.com>
 +
 +      * sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h: Define F_SETPIPE_SZ
 +      and F_GETPIPE_SZ.
 +      * sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Likewise.
 +      * sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h: Likewise.
 +      * sysdeps/unix/sysv/linux/s390/bits/fcntl.h: Likewise.
 +      * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise.
 +      * sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Likewise.
 +      * sysdeps/unix/sysv/linux/ia64/bits/fcntl.h: Likewise
 +
+ 2010-06-14  Roland McGrath  <roland@redhat.com>
+ 
+       * manual/libc.texinfo (@copying): Change to GFDL v1.3.
+ 
  2010-06-07  Jakub Jelinek  <jakub@redhat.com>
  
        * libio/stdio.h (sscanf, vsscanf): Use __REDIRECT_NTH instead of