Merge branch 'maint'

diff --cc ChangeLog
index 237da58,653c421..ba0d233
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,19 +1,23 @@@
+ 2010-06-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       Rewrite manual to be gender-neutral.
+       * doc/automake.texi (GNU Build System)
+       (Standard Directory Variables, General Operation, CVS)
+       (Hard-Coded Install Paths, Dependencies As Side Effects):
+       Rewrite text to not contain gender-specific pronouns when
+       speaking about developers or users, either by avoiding pronouns
+       or by addressing them as `you' instead.
+       * THANKS: Update.
+       Report by Christina Gratorp.
+ 
+       * AUTHORS: Update.
+ 
  2010-06-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
 +      Tiny fix in silent8.test (display output of `make' command).
 +      * tests/silent8.test: Make sure that the captured output of `make'
 +      command is always displayed.
 +
        Make tests on user extensibility of silent-rules mode stricter.
        * tests/silent6.test: Made stricter w.r.t. the grepping of the
        output produced by `make'.

diff --cc THANKS
Simple merge

diff --cc doc/automake.texi
Simple merge