Merge branch 'master' of ssh://git.fedorahosted.org/git/elfutils into robustify

diff --cc libelf/ChangeLog
Simple merge

diff --cc libelf/elf32_updatefile.c
Simple merge

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