Merge branch 'master' into robustify

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

Thu, 22 Mar 2012 17:28:31 +0000 (10:28 -0700)

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

Thu, 22 Mar 2012 17:28:31 +0000 (10:28 -0700)
author Roland McGrath <roland@hack.frob.com>
Thu, 22 Mar 2012 17:28:31 +0000 (10:28 -0700)
committer Roland McGrath <roland@hack.frob.com>
Thu, 22 Mar 2012 17:28:31 +0000 (10:28 -0700)
diff --cc libelf/ChangeLog
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/readelf.c
Simple merge
author	Roland McGrath <roland@hack.frob.com>
	Thu, 22 Mar 2012 17:28:31 +0000 (10:28 -0700)
committer	Roland McGrath <roland@hack.frob.com>
	Thu, 22 Mar 2012 17:28:31 +0000 (10:28 -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