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

author Andreas Schwab <schwab@redhat.com>

Wed, 20 Jan 2010 16:34:29 +0000 (17:34 +0100)

committer Andreas Schwab <schwab@redhat.com>

Wed, 20 Jan 2010 16:34:29 +0000 (17:34 +0100)
author Andreas Schwab <schwab@redhat.com>
Wed, 20 Jan 2010 16:34:29 +0000 (17:34 +0100)
committer Andreas Schwab <schwab@redhat.com>
Wed, 20 Jan 2010 16:34:29 +0000 (17:34 +0100)
diff --cc ChangeLog
Simple merge
diff --cc include/features.h
Simple merge
diff --cc nptl/ChangeLog
Simple merge
author	Andreas Schwab <schwab@redhat.com>
	Wed, 20 Jan 2010 16:34:29 +0000 (17:34 +0100)
committer	Andreas Schwab <schwab@redhat.com>
	Wed, 20 Jan 2010 16:34:29 +0000 (17:34 +0100)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
include/features.h	patch \|	diff1 \|	diff2 \|	blob \| history
nptl/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history