Merge branch 'maint'

Conflicts:
	ChangeLog

Apparently I messed up doing a previous 'git pull', so that the "latest"
maint I've merged into master (and pushed!) wasn't a fast-forward from
origin/maint.  Yay for me.  This merge should help cleaning up the mess.

diff --cc ChangeLog
index 57c4241,1ec0355..8c5a8f4
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,5 +1,14 @@@
++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