Merge branch 'master' into robustify

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

Tue, 21 Feb 2012 19:14:36 +0000 (11:14 -0800)

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

Tue, 21 Feb 2012 19:14:36 +0000 (11:14 -0800)
author Roland McGrath <roland@hack.frob.com>
Tue, 21 Feb 2012 19:14:36 +0000 (11:14 -0800)
committer Roland McGrath <roland@hack.frob.com>
Tue, 21 Feb 2012 19:14:36 +0000 (11:14 -0800)
diff --cc src/ChangeLog
Simple merge
diff --cc src/elflint.c
Simple merge
diff --cc src/readelf.c
Simple merge
diff --cc src/strip.c
Simple merge
author	Roland McGrath <roland@hack.frob.com>
	Tue, 21 Feb 2012 19:14:36 +0000 (11:14 -0800)
committer	Roland McGrath <roland@hack.frob.com>
	Tue, 21 Feb 2012 19:14:36 +0000 (11:14 -0800)
		1	2
src/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/elflint.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/readelf.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/strip.c	patch \|	diff1 \|	diff2 \|	blob \| history