Merge branch 'maint' into java-work
authorStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 20 May 2011 21:35:26 +0000 (23:35 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 20 May 2011 22:00:08 +0000 (00:00 +0200)
commit30f8ffc019653ba9b0ab47deda155d0efe660c8f
tree85417c23455b684551b18a97c558cd6c0d0289ab
parentbf1d029660136387a9fd4a451b230f954a81db5c
parent82fc4d353ce941f09f16738a31fb8958d0320be2
Merge branch 'maint' into java-work

* maint:
  testsuite: avoid re-running few tests with 'parallel-tests' option
  testsuite: allow tests to avoid the use of 'parallel-tests' option
  tests/README: update obsoleted advice

With extra edits to these files:
  - tests/java-compile-run-flat.test
  - tests/java-compile-run-nested.test
  - ChangeLog
  - tests/Makefile.in (autogenerated)
ChangeLog
tests/Makefile.in
tests/java-compile-run-flat.test
tests/java-compile-run-nested.test