[glibc/f21: 2/2] Merge branch 'master' into f21

[Siddhesh Poyarekar]

commit 1d9b8cb9326ba7986ab13639ccb9438b6194f9f0
Merge: 0f87ab5 f64bffe
Author: Siddhesh Poyarekar <siddhesh at redhat.com>
Date:   Tue Aug 26 15:03:47 2014 +0530

    Merge branch 'master' into f21

 glibc-rh1119128.patch              |  199 ++++++++++++++++++++++++++++++++++++
 glibc-rh1133134-i386-tlsinit.patch |   19 ++++
 glibc.spec                         |   15 +++-
 sources                            |    2 +-
 4 files changed, 232 insertions(+), 3 deletions(-)
---