Merge branch 'maint'

diff --cc ChangeLog
index 8c5a8f4da68c79a4e1fd7aede28fd89d05a0a905,f260ca50b9f3d6e7cd1c24ea7e06cdcc301402cb..da43d916398ad1bdda1feee272d142628ef3b78a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,19 +1,28 @@@
+ 2011-01-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: work around a texi+cygnus bug causing a spurious XFAIL
+       * tests/txinfo5b.test: New test, like txinfo5.test but calling
+       automake with the `-Wno-override' option to work around a bug
+       in the texinfo + cygnus interaction.
+       * tests/txinfo5.test: Update heading comments.
+       * tests/Makefile.am (TEST): Updated.
+ 
+ 2011-01-09  Dave Hart  <davehart@gmail.com>  (tiny change)
+ 
+       Fix another typo in Rule.pm comment.
+       * lib/Automake/Rule.pm: Fix typo.
+ 
 +2011-01-09  Peter Rosin  <peda@lysator.liu.se>
 +
 +      Fix another typo in Rule.pm comment.
 +      * lib/Automake/Rule.pm: Fix typo.
 +
  2011-01-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
 +      tests: texinfo unrecognized extensions
 +      * tests/txinfo-unrecognized-extension.test: New test.
 +      * tests/Makefile.am (TESTS): Update.
 +
        Improve, extend and tweak tests on Texinfo support.
        * tests/instdir-texi.test: Add a call to `ls -l' after that to
        `make', for debugging.  When looking for required tools, do not

diff --cc lib/Automake/Rule.pm
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge