Merge branch 'master' into robustify

author Roland McGrath <roland@redhat.com>

Thu, 10 Feb 2011 18:24:37 +0000 (10:24 -0800)

committer Roland McGrath <roland@redhat.com>

Thu, 10 Feb 2011 18:24:37 +0000 (10:24 -0800)
author Roland McGrath <roland@redhat.com>
Thu, 10 Feb 2011 18:24:37 +0000 (10:24 -0800)
committer Roland McGrath <roland@redhat.com>
Thu, 10 Feb 2011 18:24:37 +0000 (10:24 -0800)
diff --cc src/ChangeLog
Simple merge
diff --cc src/elflint.c
Simple merge
author	Roland McGrath <roland@redhat.com>
	Thu, 10 Feb 2011 18:24:37 +0000 (10:24 -0800)
committer	Roland McGrath <roland@redhat.com>
	Thu, 10 Feb 2011 18:24:37 +0000 (10:24 -0800)
		1	2
src/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/elflint.c	patch \|	diff1 \|	diff2 \|	blob \| history