Merge remote branch 'origin/master' into fedora/master

author Andreas Schwab <schwab@redhat.com>

Fri, 15 Jan 2010 09:44:48 +0000 (10:44 +0100)

committer Andreas Schwab <schwab@redhat.com>

Fri, 15 Jan 2010 09:51:34 +0000 (10:51 +0100)
author Andreas Schwab <schwab@redhat.com>
Fri, 15 Jan 2010 09:44:48 +0000 (10:44 +0100)
committer Andreas Schwab <schwab@redhat.com>
Fri, 15 Jan 2010 09:51:34 +0000 (10:51 +0100)
diff --cc ChangeLog
Simple merge
diff --cc Makeconfig
Simple merge
diff --cc nptl/ChangeLog
Simple merge
author	Andreas Schwab <schwab@redhat.com>
	Fri, 15 Jan 2010 09:44:48 +0000 (10:44 +0100)
committer	Andreas Schwab <schwab@redhat.com>
	Fri, 15 Jan 2010 09:51:34 +0000 (10:51 +0100)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
Makeconfig	patch \|	diff1 \|	diff2 \|	blob \| history
nptl/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history