From: Andreas Schwab <aschwab@redhat.com>
Date: Wed, 10 Jun 2009 12:04:22 +0000 (+0200)
Subject: Merge commit 'origin/master' into fedora/master
X-Git-Tag: fedora/glibc-2.10.90-1~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d02cb10e8dd8639b86450cf8e597cf5e2e09894;p=thirdparty%2Fglibc.git

Merge commit 'origin/master' into fedora/master

Conflicts:
	ChangeLog
	sysdeps/unix/sysv/linux/i386/sysconf.c
	sysdeps/x86_64/cacheinfo.c
	version.h
---

0d02cb10e8dd8639b86450cf8e597cf5e2e09894