From: Roland McGrath <roland@redhat.com>
Date: Thu, 3 Mar 2011 18:48:51 +0000 (-0800)
Subject: Merge branch 'master' of ssh://git.fedorahosted.org/git/elfutils
X-Git-Tag: elfutils-0.153~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c32696c64df869011d3a9a03c824835222cef3f9;p=thirdparty%2Felfutils.git

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

c32696c64df869011d3a9a03c824835222cef3f9
diff --cc tests/ChangeLog
index 16eb7d5f1,3fb68994e..b07967749
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@@ -1,8 -1,7 +1,12 @@@
 +2011-02-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
 +
 +	* Makefile.am (TESTS): Add run-readelf-twofiles.sh.
 +	* run-readelf-twofiles.sh: New file.
 +
+ 2011-02-25  Mark Wielaard  <mjw@redhat.com>
+ 
+ 	* Makefile.am (BUILD_RPATH): Be consistent in naming.
+ 
  2011-02-02  Josh Stone  <jistone@redhat.com>
  
  	* run-prelink-addr-test.sh: Add testfile55, 32 and 64-bit.