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

Conflicts:
	libdwfl/ChangeLog

diff --cc libdwfl/ChangeLog
index 1de4d665ced833e0457ead28ad9c08594d106d6e,7f42b43eca188c2fdcdc9e9505e6886ead48d93d..4092e913ad85d5c399e0c5d7083bc32903af296d
--- 1/libdwfl/ChangeLog
--- 2/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@@ -1,11 -1,13 +1,21 @@@
 +2007-02-10  Roland McGrath  <roland@redhat.com>
 +
 +      * libdwflP.h (struct Dwfl_Module): New members `cfi', `cfi_elf'.
 +      Add INTDECL for dwfl_module_getcfi.
 +      * dwfl_module_getcfi.c: New file.
 +      * dwfl_addrframe.c: New file.
 +      * Makefile.am (libdwfl_a_SOURCES): Add them.
 +
+ 2009-04-19  Roland McGrath  <roland@redhat.com>
+ 
+       * dwfl_module_getdwarf.c (find_file): Renamed to ...
+       (__libdwfl_getelf): ... this.  Make it global.
+       (find_symtab, find_dw): Update callers.
+       (dwfl_module_getelf): Functions moved ...
+       * dwfl_module_getelf.c: ... here, new file.
+       * Makefile.am (libdwfl_a_SOURCES): Add it.
+       * libdwflP.h: Declare __libdwfl_getelf.
+ 
  2009-04-14  Roland McGrath  <roland@redhat.com>
  
        * dwfl_segment_report_module.c: Handle DT_STRTAB value being either

diff --cc libdwfl/Makefile.am
Simple merge

diff --cc libdwfl/libdwflP.h
Simple merge