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

Conflicts:
	fedora/glibc.spec.in

diff --cc fedora/glibc.spec.in
index 4eeb08f66fca5453375042623c894cbf58e8517d,eabd17783d6ac296c7451fac4c91ab72aa05d87e..eeb45f474c9d87ca257cfb6ff0ee9458d97a7809
--- 1/fedora/glibc.spec.in
--- 2/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@@ -347,7 -347,9 +347,8 @@@ build_CFLAGS="$BuildFlags -g -O3 $*
  %ifarch %{multiarcharches}
        --enable-multi-arch \
  %endif
 -      --disable-profile --enable-experimental-malloc --enable-nss-crypt ||
 -{ cat config.log ; false }
 +      --disable-profile --enable-experimental-malloc --enable-nss-crypt
+ 
  make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s
  
  cd ..