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

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 946e945,48c62f7..a649f09
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,8 +1,13 @@@
 +2010-07-06  Ulrich Drepper  <drepper@redhat.com>
 +
 +      * sysdeps/unix/sysv/linux/fpathconf.c (__fpathconf): Implement
 +      _PC_PIPE_BUF using F_GETPIPE_SZ.
 +
+ 2010-07-05  Roland McGrath  <roland@redhat.com>
+ 
+       * manual/arith.texi (Rounding Functions): Fix rint description
+       implicit in round description.
+ 
  2010-07-02  Ulrich Drepper  <drepper@redhat.com>
  
        * elf/Makefile: Fix linking for a few tests to make recent linker