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

Conflicts:
	libdw/ChangeLog

diff --cc libdw/ChangeLog
index 0cc976943ad8c8797354c2519e2048ba90dcab59,41203397e9763ee360e2ef8f5bd6bdf3255ea88f..0400781224a814fe690acb26f28985824621d7ea
--- 1/libdw/ChangeLog
--- 2/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@@ -1,7 -1,6 +1,7 @@@
- 2010-05-28  Ulrich Drepper  <drepper@redhat.com>
+ 2010-05-28  Eduardo Santiago  <santiago@redhat.com>
  
-       * dwarf_getlocation.c (dwarf_getlocation): Move attr_ok call back to
-       the front.
 -      * 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>