Merge branch 'java-coverage'

diff --cc ChangeLog
index c254863,9640a53..3de7584
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,19 -1,12 +1,28 @@@
+ 2011-04-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       coverage: more on java support EXTRA_ and noinst_ prefixes
+       * tests/java-extra.test: New test, checking support for the
+       prefix `EXTRA_' with the JAVA primary.
+       * tests/java-noinst.test: New test, checking support for the
+       prefix `noinst_' with the JAVA primary.
+       * tests/Makefile.am (TESTS): Update.
+ 
 +2011-04-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Clarify regex code in depcomp.
 +      * lib/depcomp: Add comment why we don't need regex-escaping here.
 +      Suggested by Stefano Lattarini.
 +
 +2011-04-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Fix makedepend depmode for VPATH builds.
 +      * lib/depcomp [makedepend]: Remove any VPATH prefix from the
 +      object file name, so a rebuild doesn't attempt to update the
 +      .Po files in the source tree.
 +      * tests/depcomp9.test: New test.
 +      * tests/Makefile.am (TESTS): Update.
 +      * NEWS: Update.
 +
  2011-04-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        tests: fix timestamp-related failures

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge