Merge branch 'master' into roland/bug-compat

Conflicts:
	libdwfl/ChangeLog

diff --cc libdwfl/ChangeLog
index 1ec9cf6,274b97d..11aeafd
--- 1/libdwfl/ChangeLog
--- 2/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@@ -1,10 -1,8 +1,15 @@@
 +2008-12-16  Roland McGrath  <roland@redhat.com>
 +
 +      * dwfl_module_build_id.c (dwfl_module_build_id): Define with alias and
 +      symver magic to bind to ELFUTILS_0.138.
 +      (_BUG_COMPAT_dwfl_module_build_id): New function, bug compatible
 +      wrapper for ELFUTILS_0.130 version set.
 +
+ 2008-12-18  Roland McGrath  <roland@redhat.com>
+ 
+       * derelocate.c (dwfl_module_relocate_address): Fix last fix: ET_DYN
+       addresses are taken as relative to MOD->low_addr.
+ 
  2008-12-15  Roland McGrath  <roland@redhat.com>
  
        * derelocate.c (dwfl_module_relocate_address): Apply main.bias, not