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

author Andreas Schwab <schwab@redhat.com>

Mon, 23 Aug 2010 10:16:05 +0000 (12:16 +0200)

committer Andreas Schwab <schwab@redhat.com>

Mon, 23 Aug 2010 10:16:05 +0000 (12:16 +0200)
author Andreas Schwab <schwab@redhat.com>
Mon, 23 Aug 2010 10:16:05 +0000 (12:16 +0200)
committer Andreas Schwab <schwab@redhat.com>
Mon, 23 Aug 2010 10:16:05 +0000 (12:16 +0200)
diff --cc ChangeLog
Simple merge
diff --cc nptl/ChangeLog
Simple merge
diff --cc nss/Makefile
Simple merge
diff --cc sysdeps/posix/getaddrinfo.c
Simple merge
author	Andreas Schwab <schwab@redhat.com>
	Mon, 23 Aug 2010 10:16:05 +0000 (12:16 +0200)
committer	Andreas Schwab <schwab@redhat.com>
	Mon, 23 Aug 2010 10:16:05 +0000 (12:16 +0200)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
nptl/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
nss/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
sysdeps/posix/getaddrinfo.c	patch \|	diff1 \|	diff2 \|	blob \| history