Merge branch 'master' into dwarf

Conflicts:
	libdw/ChangeLog

diff --cc libdw/ChangeLog
index c92286376db123f6b848eeda11b7197a278560c4,89225e937a023f594754a8d73e7995bc9e201b4a..8a5eb2981b424665369d55be1dbeded4cd9dc85b
--- 1/libdw/ChangeLog
--- 2/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@@ -1,8 -1,7 +1,12 @@@
 +2009-01-10  Roland McGrath  <roland@redhat.com>
 +
 +      * c++/dwarf: New file.
 +      * Makefile.am (pkginclude_HEADERS): Add it.
 +
+ 2009-01-25  Roland McGrath  <roland@redhat.com>
+ 
+       * dwarf_getattrs.c: Correctly skip attribute values when restarting.
+ 
  2009-01-23  Roland McGrath  <roland@redhat.com>
  
        * Makefile.am ($(srcdir)/known-dwarf.h): Target renamed back.