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

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 797a7460afc183da6061f6ee7ba2e938753299f0,7b8c4438b396c9376759ab18a1b3685bd26e5574..e97b1dba76d2b9b3274e152976884d40cb451b76
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,12 +1,16 @@@
 +2009-04-29  Ulrich Drepper  <drepper@redhat.com>
 +
 +      * elflint.c (check_symtab): Add tests of st_other field.
 +
+ 2009-04-19  Roland McGrath  <roland@redhat.com>
+ 
+       * configure.ac (eu_version): Round down here, not in version.h macros.
+ 
+ 2009-04-17  Roland McGrath  <roland@redhat.com>
+ 
+       * configure.ac (eu_version): Compute number 1000 times larger,
+       let $PACKAGE_VERSION be x.y.z as well as x.y (implied x.y.0).
+ 
  2009-01-23  Roland McGrath  <roland@redhat.com>
  
        * configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.