Merge commit 'origin/master' into fedora/master

author Andreas Schwab <aschwab@redhat.com>

Wed, 10 Jun 2009 12:04:22 +0000 (14:04 +0200)

committer Andreas Schwab <aschwab@redhat.com>

Wed, 10 Jun 2009 12:04:22 +0000 (14:04 +0200)
author Andreas Schwab <aschwab@redhat.com>
Wed, 10 Jun 2009 12:04:22 +0000 (14:04 +0200)
committer Andreas Schwab <aschwab@redhat.com>
Wed, 10 Jun 2009 12:04:22 +0000 (14:04 +0200)
diff --cc ChangeLog
Simple merge
diff --cc csu/elf-init.c
Simple merge
diff --cc nptl/ChangeLog
Simple merge
diff --cc nptl/Makefile
Simple merge
diff --cc posix/Makefile
Simple merge
author	Andreas Schwab <aschwab@redhat.com>
	Wed, 10 Jun 2009 12:04:22 +0000 (14:04 +0200)
committer	Andreas Schwab <aschwab@redhat.com>
	Wed, 10 Jun 2009 12:04:22 +0000 (14:04 +0200)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
csu/elf-init.c	patch \|	diff1 \|	diff2 \|	blob \| history
nptl/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
nptl/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
posix/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history