Merge branch 'maint'

diff --cc ChangeLog
index 7fbb38934efa6f2fe0bff2173d6ed70ff9f25118,22bd532bf2dc02eb885bfe99120c283a667e9d7f..472dc557855a10b0179e044b1e6aed5cd88df3ea
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,9 +1,14 @@@
  2011-01-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
+       Sync auxiliary files from upstream.
+       * lib/config.guess, lib/config.sub, lib/texinfo.tex:
+       Sync from upstream.
+ 
 +      Avoid caching bug in cygnus mode test.
 +      * tests/cygnus-requires-maintainer-mode.test: Remove
 +      autom4te.cache directory before rerunning aclocal, to
 +      remove trace caches.
 +
        Fix maintainer-check regression.
        * tests/subobj11a.test: Pass DISTCHECK_CONFIGURE_FLAGS in the
        environment.