Merge branch 'master' into portable

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

Sat, 7 Jun 2014 06:57:30 +0000 (23:57 -0700)

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

Sat, 7 Jun 2014 06:57:30 +0000 (23:57 -0700)
author Roland McGrath <roland@hack.frob.com>
Sat, 7 Jun 2014 06:57:30 +0000 (23:57 -0700)
committer Roland McGrath <roland@hack.frob.com>
Sat, 7 Jun 2014 06:57:30 +0000 (23:57 -0700)
diff --cc ChangeLog
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/readelf.c
Simple merge
author	Roland McGrath <roland@hack.frob.com>
	Sat, 7 Jun 2014 06:57:30 +0000 (23:57 -0700)
committer	Roland McGrath <roland@hack.frob.com>
	Sat, 7 Jun 2014 06:57:30 +0000 (23:57 -0700)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/readelf.c	patch \|	diff1 \|	diff2 \|	blob \| history