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

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 03ba71f,71a392e..f8e36af
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,18 -1,10 +1,25 @@@
 +2010-04-07  Andreas Schwab  <schwab@redhat.com>
 +
 +      * sysdeps/unix/sysv/linux/i386/fallocate.c: Set errno on error.
 +      * sysdeps/unix/sysv/linux/i386/fallocate64.c: Likewise.
 +
 +2010-04-08  Andreas Jaeger  <aj@suse.de>
 +
 +      [BZ #10401]
 +      * math/s_cprojl.c (__cprojl): Fix implementation to follow C99
 +      standard.
 +      * math/s_cprojf.c (__cprojf): Likewise.
 +      * math/s_cproj.c (__cproj): Likewise.
 +      * sysdeps/ieee754/ldbl-128ibm/s_cprojl.c (__cprojl): Likewise.
 +      * math/libm-test.inc (cproj_test): Fix test.
 +
+ 2010-04-08  Roland McGrath  <roland@redhat.com>
+ 
+       * Makerules (libc-abis): Variable removed.
+       ($(common-objpfx)libc-abis.h): Depend on Makerules too.
+       Use automatic variables in commands.
+       Depend on first libc-abis from $(sysdirs) or $(..).
+ 
  2010-04-07  Ulrich Drepper  <drepper@redhat.com>
  
        * posix/bug-getopt1.c: New file.