Merge branch 'aclocal-path' into maint

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

diff --cc ChangeLog
index c12029c7675f64314323689693137a26d8dfd95d,f80f4b51e1d035b0c6a16a71e3d75c701ee3f028..47aee92b102ea42a39ef6e0407cbd7ddb9358482
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,9 +1,13 @@@
+ 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>
 +
 +      * NEWS: Fix typo.
 +
  2011-09-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        docs: document planned precedence changes in aclocal search path