Merge branch 'maint'

* maint:
  tests: fix tests on aclocal search path precedences

diff --cc ChangeLog
index d89b280717a76de0e06dc40697885d52571a9c9d,47aee92b102ea42a39ef6e0407cbd7ddb9358482..a6708864e0bd0d3730ad196f9eab61bf34892f40
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,9 +1,19 @@@
+ 2011-09-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: fix tests on aclocal search path precedences
+       * tests/aclocal-path-precedence.test: Call `$ACLOCAL' with the
+       proper overridden system acdir.
+ 
 +2011-09-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      docs: remove mention of deprecated option `--acdir'
 +      * doc/automake.texi (aclocal Options): Remove mention of
 +      deprecated `--acdir' option.
 +
 +2011-09-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      * NEWS: Cleanup after botched merges.
 +
  2011-09-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        * NEWS: Fix typo.