Merge ssh://git.fedorahosted.org/git/elfutils into roland/fixes-for-c++