Merge branch 'maint'

diff --cc ChangeLog
index 2bc75c873e6b0c19020498db0691b4b57e362e8b,18c5ff6bcbf66509392c8310ce833021bd8b2078..5fff04a04220a74c984520a1836a6126e3937cd8
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,25 -1,9 +1,31 @@@
+ 2010-11-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       Add FAQ entry for bug reporting instructions.
+       * doc/automake.texi (Reporting Bugs): New section.
+       (Introduction): Refer to it.
+ 
 +2010-10-07  Peter Rosin  <peda@lysator.liu.se>
 +
 +      depcomp: add new one-pass depmode for MSVC 7 and later.
 +      * lib/depcomp: Add new depmodes 'msvc7' and 'msvc7msys' which
 +      make use of the -showIncludes option added in MSVC 7.
 +      * m4/depend.m4 (_AM_DEPENDENCIES): Handle the new depmodes
 +      similarly to 'msvisualcpp' and 'msvcmsys' as MSVC does not
 +      support the -o option.
 +
 +2010-10-05  Jim Meyering  <meyering@redhat.com>
 +
 +      dist-xz, dist-bzip2: don't hard-code -9: honor envvar settings
 +      * lib/am/distdir.am (dist-xz): Do not hard-code xz's -9: that
 +      made it impossible to override.  Instead, use its XZ_OPT envvar,
 +      defaulting to -9 if not defined.  Thus no change in behavior
 +      when XZ_OPT is not set, and now, this rule honors the setting
 +      of that envvar when it is set.  Suggested by Lasse Collin.
 +      (dist-bzip2): Likewise for it's corresponding envvar: BZIP2.
 +      * NEWS (Miscellaneous changes): Mention it.
 +      * doc/automake.texi (The Types of Distributions): Describe the
 +      newly enabled environment variables.
 +
  2010-10-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        Add support for newer python versions.

diff --cc doc/automake.texi
Simple merge