Merge branch 'maint' into branch-1.11

* maint:
  dist: do not wrap calls to 'tar' with the 'missing' script
  fixup: previous commit v1.11-627-g1e0aedc
  tests: fix spurious failures due to autom4te caching
  parallel-tests: avoid issue with overly long lines in sed input
  sync: auxiliary files from upstream synced
  sync: fix syncing of 'gitlog-to-changelog' script
  maintcheck: avoid false positive in sc_tests_plain_make

diff --cc NEWS
index 58b2573,2b09bb5..41ef139
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -40,50 -53,6 +47,54 @@@ New in 1.11.2a
    - The last relics of Python 1.5 support have been removed from the
      AM_PATH_PYTHON macro.
  
 +  - For programs and libraries, automake now detects EXTRA_foo_DEPENDENCIES
 +    and adds them to the normal list of dependencies, but without
 +    overwriting the foo_DEPENDENCIES variable, which is normally computed
 +    by automake.
 +
 +Bugs fixed in 1.11.2a:
 +
 +* Bugs introduced by 1.11.2:
 +
 +  - Automake now correctly recognizes the prefix/primary combination
 +   `pkglibexec_SCRIPTS' as valid.
 +
++  - The parallel-tests harness doesn't trip anymore on sed implementations
++    with stricter limits on the length of input lines (problem seen at
++    least on Solaris 8).
++
 +* Long-standing bugs:
 +
 +  - The "deleted header file problem" for *.am files is avoided by stub
 +    rules.  This allows `make' to trigger a rerun of `automake' also if
 +    some previously needed `.am' file has been removed.
 +
 +  - The `silent-rules' option now generates working makefiles even
 +    for the uncommon `make' implementations that do not support the
 +    nested-variables extension to POSIX 2008.  For such `make'
 +    implementations, whether a build is silent is determined at
 +    configure time, and cannot be overridden at make time with
 +    `make V=0' or `make V=1'.
 +
 +\f
 +New in 1.11.2:
 +
 +* Changes to aclocal:
 +
 +  - The `--acdir' option is deprecated.  Now you should use the new options
 +    `--automake-acdir' and `--system-acdir' instead.
 +
 +  - The `ACLOCAL_PATH' environment variable is now interpreted as a
 +    colon-separated list of additional directories to search after the
 +    automake internal acdir (by default ${prefix}/share/aclocal-APIVERSION)
 +    and before the system acdir (by default ${prefix}/share/aclocal).
 +
 +* Miscellaneous changes:
 +
 +  - The Automake support for automatic de-ANSI-fication has been
 +    deprecated.  I will probably be removed in the next major Automake
 +    release (1.12).
 +
    - The `lzma' compression scheme and associated automake option `dist-lzma'
      is obsoleted by `xz' and `dist-xz' due to upstream changes.
  

diff --cc tests/Makefile.am
Simple merge