Merge branch 'maint'

diff --cc ChangeLog
index d48efd4110bfa67f726a3373b1f6bbf55030d59d,37168e59c4675b653780a1d7929aa0339b5d8754..d835fd1f4d736da3baf0f0475eadef8fa2289db1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,34 -1,21 +1,52 @@@
+ 2009-11-29  Karl Berry  <karl@freefriends.org>
+ 
+       Rewrite `gnupload --help' examples.
+       * lib/gnupload: Use GNU style version numbers, a generic package
+       name, and more useful examples.
+ 
+ 2009-11-28  Jim Meyering  <meyering@redhat.com>
+ 
+       avoid a warning from perl-5.11
+       * lib/Automake/Wrap.pm (_tab_length): Remove useless use of tr's
+       "/d" modifier.
+ 
+ 2009-11-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       Distribute the Automake bootstrap script.
+       * Makefile.am (EXTRA_DIST): Add bootstrap.
+       Report by Jan Engelhardt.
+ 
 +2009-11-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Coverage for corner cases in derive_suffix.
 +      Ensure unrelatex SUFFIXES entries and unrelated inference rules
 +      are ignored silently.
 +      * tests/ext3.test: New test.
 +      * tests/Makefile.am: Update.
 +
 +      Coverage for user-provided _LINK variables.
 +      * tests/link_override.test: New test.
 +      * tests/Makefile.am: Adjust.
 +
 +      Coverage: warn about substitutions that need EXTRA_PRIMARY.
 +      * tests/extra9.test: New test.
 +      * tests/Makefile.am: Adjust.
 +
 +      Coverage: warn about configure substitution in EXTRA_PRIMARY.
 +      * tests/subst5.test: New test.
 +      * tests/Makefile.am: Update.
 +
 +      Coverage for syntax errors with conditionals in included fragments.
 +      * tests/condinc2.test: Amend test.
 +
 +      Coverage: diagnose variables with forbidden dist_ prefix.
 +      * tests/candist.test: New test.
 +      * tests/Makefile.am: Update.
 +
 +      Coverage for conditional `else' and `endif' arguments.
 +      * tests/cond46.test: New test.
 +      * tests/Makefile.am: Update.
 +
  2009-10-31  Jim Meyering  <meyering@redhat.com>
            Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  

diff --cc Makefile.am
Simple merge

diff --cc Makefile.in
Simple merge

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