Merge branch 'dwarf' of ssh://pmachata@git.fedorahosted.org/git/elfutils into dwarf

Conflicts:
	src/Makefile.am

diff --cc src/Makefile.am
index 6b8e9933e14566b664c7f2bfce664647854ed8a6,11b9b2760e087265f4be5ea2ed2e1bff8cb23701..c0525feff835269fb9b28f11d94bde41e0a57d4a
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -83,8 -83,9 +83,9 @@@ libar_a_SOURCES = arlib.c arlib2.
  
  dwarfcmp_SOURCES = dwarfcmp.cc
  
- dwarflint_SOURCES = dwarflint.c dwarflint-hl.cc dwarflint-coverage.c \
-                   dwarflint-expected-at.cc dwarfstrings.c
+ dwarflint_SOURCES = dwarflint.c dwarflint.h dwarflint-hl.cc \
+                   dwarflint-expected-at.cc dwarflint-expected.hh \
 -                  dwarfstrings.c
++                  dwarfstrings.c dwarflint-coverage.c dwarflint-coverage.h
  
  readelf_SOURCES = readelf.c dwarfstrings.c