Merge branch 'master' of ssh://git.fedorahosted.org/git/elfutils into libdwfl-decompress

Conflicts:
	libdw/ChangeLog

diff --cc libdw/ChangeLog
index eda753d342837f4f91bf17b0cbe07bff3b500147,eaaab2ddac26e3c8aff69eae4167fdae6e3865b2..67b36a510a1230d639f18c08af7a7ba85797f03a
--- 1/libdw/ChangeLog
--- 2/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@@ -1,7 -1,10 +1,14 @@@
- 2009-01-05  Roland McGrath  <roland@redhat.com>
++2009-01-06  Roland McGrath  <roland@redhat.com>
 +
 +      * Makefile.am (libdw.so): Link in $(zip_LIBS).
 +
+ 2009-01-06  Ulrich Drepper  <drepper@redhat.com>
+ 
 -      * libdw.h: Add definition for unwind and call frame information.
++      * dwarf.h: Add definition for unwind and call frame information.
+ 
+       * memory-access.h: Define read_ubyte_unaligned, read_sbyte_unaligned,
+       read_ubyte_unaligned_inc, and read_sbyte_unaligned_inc.
+ 
  2008-08-15  Roland McGrath  <roland@redhat.com>
  
        * libdw.map (ELFUTILS_0.136): New version set, inherits from