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

…/master

Conflicts:
	fedora/glibc.spec.in

fedora/glibc.spec.in

@@ -21,7 +21,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 16
+Release: 17
 # 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
@@ -348,6 +348,7 @@ build_CFLAGS="$BuildFlags -g -O3 $*"
 	--enable-multi-arch \
 %endif
 	--disable-profile --enable-experimental-malloc --enable-nss-crypt
+
 make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s
 
 cd ..
@@ -1025,6 +1026,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Thu Aug 27 2009 Roland McGrath <roland@redhat.com> - 2.10.90-17
+- Update from master.
+
 * Wed Aug 26 2009 Andreas Schwab <schwab@redhat.com> - 2.10.90-16
 - Update from master.
   - handle AVX saving on x86-64 in interrupted symbol lookups (#519081).