Merge branch 'maint'

diff --cc ChangeLog
index 5a9a50ae140aab81d20b9a192a0ab1a65b2a89c7,cb4e565e7ed7b30d56a9993cd2528a456c07bfd7..c80c2ee7b0c2b343e9e7d9ccfca98909e9ef0119
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,33 -1,10 +1,40 @@@
+ 2010-12-21  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       Fix sed-related buglet in test "subdir5.test"
+       * tests/subdir5.test: Always terminate text passed to the
+       `i' sed command with a newline, to work around limitations
+       in e.g. older OpenBSD sed.
+ 
 +2010-12-21  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Fix spurious failures in tests on AC_CONFIG_AUX_DIR.
 +      * tests/auxdir7.test: Do not try to needlessly overwrite the files
 +      `install-sh' and `missing'.  This avoid spurious failures in "make
 +      distcheck", when those files might be copied as read-only from the
 +      `lib' directory.
 +      * tests/auxdir8.test: Likewise.
 +
 +2010-12-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Make test 'posixsubst-script' portable to MinGW/MSYS.
 +      * tests/posixsubst-script.test: Ensure that the generated dummy
 +      scripts really start with a shebang line, to work around a
 +      limitation of 'test -x' on MinGW/MSYS.
 +      Reported by Ralf Wildenhues.
 +
 +      Improve comments in tests `posixsubst*.test'.
 +      * tests/posixsubst-data.test: Improve comment explaining why we
 +      try also empty match suffix.
 +      * tests/posixsubst-extradist.test: Likewise.
 +      * tests/posixsubst-ldadd.test: Likewise.
 +      * tests/posixsubst-libraries.test: Likewise.
 +      * tests/posixsubst-ltlibraries.test: Likewise.
 +      * tests/posixsubst-programs.test: Likewise.
 +      * tests/posixsubst-scripts.test: Likewise.
 +      * tests/posixsubst-sources.test: Likewise.
 +      * tests/posixsubst-tests.test: Likewise.
 +      Suggested by Ralf Wildenhues.
 +
  2010-12-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        docs: fix blunder in example about python extension modules