Merge remote-tracking branch 'origin/release/2.14/master' into fedora/2.14/master

author Andreas Schwab <schwab@redhat.com>

Fri, 7 Oct 2011 11:33:24 +0000 (13:33 +0200)

committer Andreas Schwab <schwab@redhat.com>

Fri, 7 Oct 2011 11:33:24 +0000 (13:33 +0200)
author Andreas Schwab <schwab@redhat.com>
Fri, 7 Oct 2011 11:33:24 +0000 (13:33 +0200)
committer Andreas Schwab <schwab@redhat.com>
Fri, 7 Oct 2011 11:33:24 +0000 (13:33 +0200)
diff --cc ChangeLog
Simple merge
diff --cc NEWS
Simple merge
diff --cc nptl/ChangeLog
Simple merge
diff --cc nptl/nptl-init.c
Simple merge
author	Andreas Schwab <schwab@redhat.com>
	Fri, 7 Oct 2011 11:33:24 +0000 (13:33 +0200)
committer	Andreas Schwab <schwab@redhat.com>
	Fri, 7 Oct 2011 11:33:24 +0000 (13:33 +0200)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
nptl/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
nptl/nptl-init.c	patch \|	diff1 \|	diff2 \|	blob \| history