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

diff --cc tests/ChangeLog
index 16eb7d5,3fb6899..b079677
--- 1/tests/ChangeLog
--- 2/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.

diff --cc tests/Makefile.am
Simple merge