Merge branch 'master' into test-protocols

* master:
  fix: regenerate Makefile.in files
  maintcheck: fix usage of `cd' instead of `$(am__cd)'

diff --cc ChangeLog
index a6779c5e152e725830afc1df66a6b60dbd4d0149,97083ddcea6962ffe8fbc0efe6712fbd4ec958b1..c28f9e430a18be4db4d606a78c8bff336692d946
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,27 -1,9 +1,33 @@@
+ 2011-09-28  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       maintcheck: fix usage of `cd' instead of `$(am__cd)'
+       * lib/am/inst-vars.am (am__uninstall_files_from_dir): Use
+       `$(am__cd)', not plain `cd'.
+ 
 +2011-09-28  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tap/awk: account for unusual korn shell signal handling behaviour
 +      This change has been motivated by a testsuite failure on Debian
 +      with the AT&T Korn Shell version 93u-1.
 +      * lib/tap-driver.sh: Temporarily ignore some common signals when
 +      waiting for the test command to complete, to avoid premature exit
 +      in Korn shells that propagate to themselves signals that have
 +      killed a child process.
 +      See also related commit `v1.11-1342-g6321ad3'.
 +
 +2011-09-28  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tap/awk: handle exit statuses > 256 (seen on few korn shells)
 +      Some Korn shells, when a child process die due to signal number
 +      n, can leave in $? an exit status of 256+n instead of the more
 +      standard 128+n.  Apparently, both behaviours are allowed by
 +      POSIX, so be prepared to handle them both.
 +      This change has been motivated by a testsuite failure on Debian
 +      with the AT&T Korn Shell version 93u-1.
 +      * lib/tap-driver.sh (get_test_exit_message): Handle the described
 +      Korn Shell behaviour too.
 +      ($scriptversion): Update.
 +
  2011-09-24  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        uninstall: "make uninstall" before "make install" works

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

diff --cc lib/Makefile.in
Simple merge

diff --cc tests/Makefile.in
Simple merge