Merge branch 'master' of ssh://git.fedorahosted.org/git/elfutils

Conflicts:
	libdw/ChangeLog
diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 4120339..0400781 100644
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,6 +1,7 @@
 2010-05-28  Eduardo Santiago  <santiago@redhat.com>
 
-	* dwarf_getlocation.c (dwarf_getlocation): Do attr_ok check first thing.
+	* dwarf_getlocation.c (dwarf_getlocation): Do attr_ok check first
+	thing.
 
 2010-05-27  Roland McGrath  <roland@redhat.com>
 
@@ -1333,4 +1334,4 @@
 
 2003-08-11  Ulrich Drepper  <drepper@redhat.com>
 
-        * Moved to CVS archive.
+	* Moved to CVS archive.