Merge remote branch 'origin/master' into fedora/master

diff --cc ChangeLog
Simple merge

diff --cc ChangeLog.17
index 283a5587bc694441cccdcf50809ec43c4df28f83,92f973968046e1da05e6bb4a3e1adc38ffefffb0..d933d56f4f62d9c8593813bbb4d00a52f65b5f6a
--- 1/ChangeLog.17
--- 2/ChangeLog.17
+++ b/ChangeLog.17
@@@ -1016,19 -1010,6 +1016,13 @@@
        * sysdeps/x86_64/fpu/fegetenv.c: Likewise
        * sysdeps/s390/fpu/fegetenv.c: Likewise.  Remove unused headers.
  
- 2010-02-08  Andreas Schwab  <schwab@redhat.com>
- 
-       [BZ #11155]
-       * sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c: Include i386
-       version.
- 
 +2009-10-27  Aurelien Jarno  <aurelien@aurel32.net>
 +
 +      [BZ #10855]
 +      * locale/programs/locarchive.c: use MMAP_SHARED to reserve memory
 +      used later with MMAP_FIXED | MMAP_SHARED to cope with different
 +      alignment restrictions.
 +
  2010-02-05  H.J. Lu  <hongjiu.lu@intel.com>
  
        [BZ #11230]

diff --cc elf/Makefile
Simple merge

diff --cc elf/dl-support.c
Simple merge

diff --cc elf/ldconfig.c
Simple merge

diff --cc elf/rtld.c
Simple merge

diff --cc include/features.h
Simple merge

diff --cc include/sys/resource.h
Simple merge

diff --cc nptl/ChangeLog
Simple merge

diff --cc nptl/Makefile
Simple merge

diff --cc nptl/Versions
index 52ca0bfee08b4bd5ed476e7f63a474b8e791a596,5a884202f1fbbf66decd4d0f5e23f25624ceac48..fb7728df964510c7b0dab2f8182e0d1a3a97e418
--- 1/nptl/Versions
--- 2/nptl/Versions
+++ b/nptl/Versions
@@@ -27,9 -27,9 +27,10 @@@ libc 
      pthread_cond_broadcast; pthread_cond_timedwait;
    }
    GLIBC_PRIVATE {
+     __libc_alloca_cutoff;
      # Internal libc interface to libpthread
      __libc_dl_error_tsd;
 +    __getrlimit;
    }
  }
  

diff --cc stdio-common/vfprintf.c
Simple merge

diff --cc sysdeps/i386/Makefile
Simple merge