Merge commit 'origin/release/2.10/master' into fedora/2.10/master

author Andreas Schwab <schwab@redhat.com>

Wed, 29 Jul 2009 11:41:25 +0000 (13:41 +0200)

committer Andreas Schwab <schwab@redhat.com>

Wed, 29 Jul 2009 11:41:25 +0000 (13:41 +0200)
author Andreas Schwab <schwab@redhat.com>
Wed, 29 Jul 2009 11:41:25 +0000 (13:41 +0200)
committer Andreas Schwab <schwab@redhat.com>
Wed, 29 Jul 2009 11:41:25 +0000 (13:41 +0200)
diff --cc ChangeLog
Simple merge
diff --cc nptl/ChangeLog
Simple merge
author	Andreas Schwab <schwab@redhat.com>
	Wed, 29 Jul 2009 11:41:25 +0000 (13:41 +0200)
committer	Andreas Schwab <schwab@redhat.com>
	Wed, 29 Jul 2009 11:41:25 +0000 (13:41 +0200)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
nptl/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history