Merge commit 'origin/master' into dwarf

diff --cc libdw/ChangeLog
index da396cafceae7b49f4601bec00a06a0d3f07ac46,d66f34b0305614a3a8bbe3ce9ae5addcf96d175e..06ff0290f17424eb8a6ac3b9c7c61b45ccf79700
--- 1/libdw/ChangeLog
--- 2/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@@ -1,18 -1,10 +1,21 @@@
  2009-01-28  Roland McGrath  <roland@redhat.com>
  
+       * libdwP.h (struct Dwarf_Line_s): Move out of struct Dwarf_Lines_s
+       defn so C++ doesn't scope the name to not match the Dwarf_Line typedef.
+ 
        * libdwP.h (struct Dwarf_Files_s): Replace dbg field with cu field.
  
 +2009-01-26  Roland McGrath  <roland@redhat.com>
 +
 +      * c++/dwarf (dwarf_output): Renamed to dwarf_edit and moved to ...
 +      * c++/dwarf_edit: ... here.  New file.
 +      * Makefile.am (pkginclude_HEADERS): Add it.
 +
 +2009-01-10  Roland McGrath  <roland@redhat.com>
 +
 +      * c++/dwarf: New file.
 +      * Makefile.am (pkginclude_HEADERS): Add it.
 +
  2009-01-26  Roland McGrath  <roland@redhat.com>
  
        * dwarf_ranges.c: Return 0 when no ranges or *_pc attrs at all.

diff --cc libdw/libdwP.h
Simple merge