Merge branch 'release/2.11/master' into fedora/2.11/master

author Andreas Schwab <schwab@redhat.com>

Mon, 30 Nov 2009 13:53:29 +0000 (14:53 +0100)

committer Andreas Schwab <schwab@redhat.com>

Mon, 30 Nov 2009 13:54:41 +0000 (14:54 +0100)
author Andreas Schwab <schwab@redhat.com>
Mon, 30 Nov 2009 13:53:29 +0000 (14:53 +0100)
committer Andreas Schwab <schwab@redhat.com>
Mon, 30 Nov 2009 13:54:41 +0000 (14:54 +0100)
diff --cc ChangeLog
Simple merge
diff --cc csu/elf-init.c
Simple merge
diff --cc nptl/ChangeLog
Simple merge
diff --cc posix/Makefile
Simple merge
author	Andreas Schwab <schwab@redhat.com>
	Mon, 30 Nov 2009 13:53:29 +0000 (14:53 +0100)
committer	Andreas Schwab <schwab@redhat.com>
	Mon, 30 Nov 2009 13:54:41 +0000 (14:54 +0100)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
csu/elf-init.c	patch \|	diff1 \|	diff2 \|	blob \| history
nptl/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
posix/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history