From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 29 May 2010 03:32:37 +0000 (-0700)
Subject: Merge branch 'master' of ssh://git.fedorahosted.org/git/elfutils
X-Git-Tag: elfutils-0.148~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49fe7143b5d24dc3e5ee609c03af7ead47d4a5a4;p=thirdparty%2Felfutils.git

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

Conflicts:
	libdw/ChangeLog
---

49fe7143b5d24dc3e5ee609c03af7ead47d4a5a4
diff --cc libdw/ChangeLog
index 0cc976943,41203397e..040078122
--- a/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>