Merge commit 'origin/master' into fedora/master

author Roland McGrath <roland@redhat.com>

Tue, 4 May 2010 19:13:28 +0000 (12:13 -0700)

committer Roland McGrath <roland@redhat.com>

Tue, 4 May 2010 19:13:28 +0000 (12:13 -0700)
author Roland McGrath <roland@redhat.com>
Tue, 4 May 2010 19:13:28 +0000 (12:13 -0700)
committer Roland McGrath <roland@redhat.com>
Tue, 4 May 2010 19:13:28 +0000 (12:13 -0700)
diff --cc ChangeLog
Simple merge
diff --cc Makeconfig
Simple merge
diff --cc elf/ldconfig.c
Simple merge
diff --cc include/features.h
Simple merge
author	Roland McGrath <roland@redhat.com>
	Tue, 4 May 2010 19:13:28 +0000 (12:13 -0700)
committer	Roland McGrath <roland@redhat.com>
	Tue, 4 May 2010 19:13:28 +0000 (12:13 -0700)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
Makeconfig	patch \|	diff1 \|	diff2 \|	blob \| history
elf/ldconfig.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/features.h	patch \|	diff1 \|	diff2 \|	blob \| history