[glibc: 2/2] Merge remote-tracking branch 'origin/f16'

[Jeffrey Law]

commit 608edcf2b63db4283d988c5c5e7f3eadcd005200
Merge: b327b51 2c67eb0
Author: Jeff Law <law at redhat.com>
Date:   Tue Dec 6 11:20:45 2011 -0700

    Merge remote-tracking branch 'origin/f16'
    
    Conflicts:
    	glibc.spec

 glibc-rh750858.patch |   35 +++++++
 glibc-rh757887.patch |  242 ++++++++++++++++++++++++++++++++++++++++++++++++++
 glibc.spec           |   10 ++-
 3 files changed, 286 insertions(+), 1 deletions(-)
---
diff --cc glibc.spec
index f286167,63cda91..735e3c6
--- a/glibc.spec
+++ b/glibc.spec
@@@ -28,7 -28,7 +28,7 @@@
  Summary: The GNU libc libraries
  Name: glibc
  Version: %{glibcversion}
- Release: 20%{?dist}
 -Release: 21
++Release: 21%{?dist}
  # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
  # Things that are linked directly into dynamically linked programs
  # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional