Merge branch 'maint'

diff --cc ChangeLog
index da01f8f,a6faf81..45950f4
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,25 -1,28 +1,50 @@@
+ 2010-02-06  Dmitry V. Levin  <ldv@altlinux.org>  (tiny change)
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       Fix exit status of signal handlers in shell scripts.
+       The value of `$?' on entrance to signal handlers in shell scripts
+       cannot be relied upon, so set the exit code explicitly to
+       128 + SIG<SIGNAL>.
+       * lib/am/check.am (am__check_pre): Use `exit 143' in signal handler.
+       * lib/elisp-comp: Likewise.
+       * lib/install-sh: Likewise.
+       * lib/ylwrap: Likewise.  Also, fix script to trap signal 13, not 3.
+       * NEWS, THANKS: Update.
+       Bug report, analysis, and initial patch by Dmitry V. Levin.
+ 
+ 2010-02-06  Karl Berry  <karl@gnu.org>
+ 
+       Improve gnupload usage text.
+       * gnupload (usage): Shorten to make more likely to fit on a tty
+       line.  Mention CMD in the synopsis.  With ..., plural is implied.
+ 
+ 2010-01-28  Christos Kontas  <xakon@yahoo.com>  (tiny change)
+ 
+       Fix some typos in the manual
+       * doc/automake.texi (Nested Packages, Rebuilding): Fix typos.
+ 
 +2010-01-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Fix silent-rules output for disabled dependency tracking.
 +      * lib/am/depend2.am [!%FASTDEP%]: Rework silent-rules variable
 +      expansion code to also work in the case where %AMDEP% expands
 +      to FALSE at config.status time, using new substitution string
 +      %VERBOSE-NODEP%.
 +      * automake.in (verbose_nodep_flag): New function, appending
 +      `@am__nodep@' to the verbose-variable name.
 +      (handle_languages): If dependencies are not disabled, use it to
 +      set %VERBOSE-NODEP%.
 +      * m4/depend.m4: Substitute am__nodep as '_no', so the second
 +      verbose-variable will always expand to an empty string, if
 +      dependencies are enabled.
 +      * tests/silent5.test: Also test --disable-dependency-tracking;
 +      also test per-target flags for non-C language files.
 +      * tests/silent9.test: New test, like silent4.test but disable
 +      dependency tracking.
 +      * tests/Makefile.am: Adjust.
 +      * NEWS, THANKS: Update.
 +      Report by Dmitry V. Levin <ldv@altlinux.org>.
 +
  2010-01-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        Slighty improve tests acoutbs.test and acoutbs2.test.

diff --cc HACKING
Simple merge

diff --cc NEWS
index 3ea10b5,2284680..704302e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -40,11 -21,9 +40,14 @@@ Bugs fixed in 1.11a
    - AM_PROG_GCJ uses AC_CHECK_TOOLS to look for `gcj' now, so that prefixed
      tools are preferred in a cross-compile setup.
  
 +  - The distribution is tarred up with mode 755 now by the `dist*' targets.
 +    This fixes a race condition where untrusted users could modify files
 +    in the $(PACKAGE)-$(VERSION) distdir before packing if the toplevel
 +    build directory was world-searchable.  This is CVE-2009-4029.
 +
+   - Several scripts as well as the parallel-tests testsuite driver now
+     exit with the right exit status upon receiving a signal.
+ 
  \f
  New in 1.11:
  

diff --cc doc/automake.texi
Simple merge

diff --cc lib/Automake/tests/Makefile.in
Simple merge

diff --cc tests/Makefile.in
Simple merge