Merge branch 'roland/known-dwarf' into dwarf

Conflicts:
	libdw/ChangeLog

diff --cc libdw/ChangeLog
index c9e27245990ce1a7f4b7c96ca2406db32dfb7a53,9b9be90c724477384bfa53775fac27dc704e3843..3e8c618d3bee8f0eb354b2a0c5d700f11c27861a
--- 1/libdw/ChangeLog
--- 2/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@@ -1,14 -1,11 +1,22 @@@
 +2009-01-10  Roland McGrath  <roland@redhat.com>
 +
 +      * c++/dwarf: New file.
 +      * Makefile.am (pkginclude_HEADERS): Add it.
 +
 +2008-01-06  Roland McGrath  <roland@redhat.com>
 +
 +      * libdwP.h (struct Dwarf_Abbrev): Change type of 'has_children' to bool.
 +      Reorder members.
 +      * dwarf_haschildren.c: Return -1 for error case, not 0.
 +
+ 2009-01-11  Roland McGrath  <roland@redhat.com>
+ 
+       * dwarf.h: Add description comments for DW_LANG_* values.
+ 
+       * Makefile.am [MAINTAINER_MODE]
+       ($(srcdir)/known-dwarf.h): New target.
+       (BUILT_SOURCES): Add it.
+ 
  2009-01-10  Ulrich Drepper  <drepper@redhat.com>
  
        * dwarf_error.c: Always use __thread.  Remove all !USE_TLS code.

diff --cc libdw/Makefile.am
Simple merge