Merge branch 'maint'

diff --cc ChangeLog
index d8e0a76,99e4f11..67bdf6f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,11 +1,18 @@@
  2011-04-24  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
+       tests: fix spurious failure in a test on TESTS (VPATH-related)
+       * check-tests-in-builddir.test: When not using the parallel-tests
+       option, do not check that VPATH components are not present in the
+       displayed test name, since the simple-tests driver do not try to
+       strip them.
+ 
++2011-04-24  Stefano Lattarini  <stefano.lattarini@gmail.com>
++
 +      tests: fix spurious failure in self-check-env-sanitize.test
 +      * tests/self-check-env-sanitize.test: Open file descriptor `5'
 +      to stdout.
 +      Fix spurious failure introduced by merge `v1.11-788-g3b0c8d5'.
 +
  2011-04-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        test: self check subroutines for skipping/failing of tests

diff --cc tests/check-tests-in-builddir.test
Simple merge