Merge branch 'master' into robustify

author Roland McGrath <roland@redhat.com>

Fri, 10 Sep 2010 06:27:43 +0000 (23:27 -0700)

committer Roland McGrath <roland@redhat.com>

Fri, 10 Sep 2010 06:27:43 +0000 (23:27 -0700)
author Roland McGrath <roland@redhat.com>
Fri, 10 Sep 2010 06:27:43 +0000 (23:27 -0700)
committer Roland McGrath <roland@redhat.com>
Fri, 10 Sep 2010 06:27:43 +0000 (23:27 -0700)
diff --cc libelf/ChangeLog
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/readelf.c
Simple merge
author	Roland McGrath <roland@redhat.com>
	Fri, 10 Sep 2010 06:27:43 +0000 (23:27 -0700)
committer	Roland McGrath <roland@redhat.com>
	Fri, 10 Sep 2010 06:27:43 +0000 (23:27 -0700)
		1	2
libelf/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/readelf.c	patch \|	diff1 \|	diff2 \|	blob \| history