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

author Andreas Schwab <aschwab@redhat.com>

Tue, 16 Jun 2009 11:04:18 +0000 (13:04 +0200)

committer Andreas Schwab <aschwab@redhat.com>

Tue, 16 Jun 2009 11:04:18 +0000 (13:04 +0200)
author Andreas Schwab <aschwab@redhat.com>
Tue, 16 Jun 2009 11:04:18 +0000 (13:04 +0200)
committer Andreas Schwab <aschwab@redhat.com>
Tue, 16 Jun 2009 11:04:18 +0000 (13:04 +0200)
diff --cc ChangeLog
Simple merge
diff --cc localedata/SUPPORTED
Simple merge
diff --cc nptl/ChangeLog
Simple merge
diff --cc nptl/Makefile
Simple merge
author	Andreas Schwab <aschwab@redhat.com>
	Tue, 16 Jun 2009 11:04:18 +0000 (13:04 +0200)
committer	Andreas Schwab <aschwab@redhat.com>
	Tue, 16 Jun 2009 11:04:18 +0000 (13:04 +0200)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
localedata/SUPPORTED	patch \|	diff1 \|	diff2 \|	blob \| history
nptl/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
nptl/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history