Merge branch 'master' into roland/relocate

Conflicts:
	libdw/ChangeLog

diff --cc libdw/ChangeLog
index 18afa68253608a53226f17391f4a5a979f0f3c0c,17658581db131c45258b3fd868dfbe9e8c8324b3..e3b631bc41627634e812084b2ad8d2efd714cfcf
--- 1/libdw/ChangeLog
--- 2/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@@ -1,15 -1,7 +1,17 @@@
  2010-06-22  Roland McGrath  <roland@redhat.com>
  
 +      * libdw.h (Dwarf_Relocatable): New type.  Declare three new functions.
 +      * dwarf_relocatable_info.c: New file.
 +      * dwarf_form_relocatable.c: New file.
 +      * dwarf_line_relocatable.c: New file.
 +      * Makefile.am (libdw_a_SOURCES): Add them.
 +      * libdw.map (ELFUTILS_0.149): New set; add those.
 +
 +      * relocate.c (__libdw_relocatable): New function.
 +      * libdwP.h: Declare it.
 +
+       * dwarf_getlocation.c (check_constant_offset): data[48] are constant.
+ 
        * dwarf_getsrclines.c: Fix signed comparison warning in extended
        opcode parsing.