Merge branch 'master' into robustify

author Roland McGrath <roland@hack.frob.com>

Fri, 20 Jan 2012 18:59:12 +0000 (10:59 -0800)

committer Roland McGrath <roland@hack.frob.com>

Fri, 20 Jan 2012 18:59:12 +0000 (10:59 -0800)
author Roland McGrath <roland@hack.frob.com>
Fri, 20 Jan 2012 18:59:12 +0000 (10:59 -0800)
committer Roland McGrath <roland@hack.frob.com>
Fri, 20 Jan 2012 18:59:12 +0000 (10:59 -0800)
diff --cc libdwfl/ChangeLog
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/readelf.c
Simple merge
author	Roland McGrath <roland@hack.frob.com>
	Fri, 20 Jan 2012 18:59:12 +0000 (10:59 -0800)
committer	Roland McGrath <roland@hack.frob.com>
	Fri, 20 Jan 2012 18:59:12 +0000 (10:59 -0800)
		1	2
libdwfl/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/readelf.c	patch \|	diff1 \|	diff2 \|	blob \| history