Merge commit 'origin/master' into fedora/master

author Roland McGrath <roland@redhat.com>

Thu, 27 Aug 2009 20:41:23 +0000 (13:41 -0700)

committer Roland McGrath <roland@redhat.com>

Thu, 27 Aug 2009 20:41:23 +0000 (13:41 -0700)
author Roland McGrath <roland@redhat.com>
Thu, 27 Aug 2009 20:41:23 +0000 (13:41 -0700)
committer Roland McGrath <roland@redhat.com>
Thu, 27 Aug 2009 20:41:23 +0000 (13:41 -0700)
diff --cc ChangeLog
Simple merge
diff --cc nptl/ChangeLog
Simple merge
author	Roland McGrath <roland@redhat.com>
	Thu, 27 Aug 2009 20:41:23 +0000 (13:41 -0700)
committer	Roland McGrath <roland@redhat.com>
	Thu, 27 Aug 2009 20:41:23 +0000 (13:41 -0700)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
nptl/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history