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

author Andreas Schwab <schwab@redhat.com>

Fri, 12 Nov 2010 11:02:31 +0000 (12:02 +0100)

committer Andreas Schwab <schwab@redhat.com>

Fri, 12 Nov 2010 11:02:31 +0000 (12:02 +0100)
author Andreas Schwab <schwab@redhat.com>
Fri, 12 Nov 2010 11:02:31 +0000 (12:02 +0100)
committer Andreas Schwab <schwab@redhat.com>
Fri, 12 Nov 2010 11:02:31 +0000 (12:02 +0100)
diff --cc ChangeLog
Simple merge
diff --cc Makeconfig
Simple merge
diff --cc elf/dl-load.c
Simple merge
diff --cc elf/rtld.c
Simple merge
diff --cc posix/Makefile
Simple merge
author	Andreas Schwab <schwab@redhat.com>
	Fri, 12 Nov 2010 11:02:31 +0000 (12:02 +0100)
committer	Andreas Schwab <schwab@redhat.com>
	Fri, 12 Nov 2010 11:02:31 +0000 (12:02 +0100)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
Makeconfig	patch \|	diff1 \|	diff2 \|	blob \| history
elf/dl-load.c	patch \|	diff1 \|	diff2 \|	blob \| history
elf/rtld.c	patch \|	diff1 \|	diff2 \|	blob \| history
posix/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history