Merge branch 'maint' into java-work

diff --cc ChangeLog
Simple merge

diff --cc lib/am/java.am
index e0f5bba250b01aafb4a0973dbe95ec78b63d797d,604df222956c44811096cd8ebc01c2b2c8cdd4ff..464b706099babda5f8a1c7c1fff3872cbbae7d5b
--- 1/lib/am/java.am
--- 2/lib/am/java.am
+++ b/lib/am/java.am
@@@ -20,13 -20,11 +20,13 @@@
  ## Building.  ##
  ## ---------- ##
  
 +if %?FIRST%
  JAVAC = javac
- CLASSPATH_ENV = CLASSPATH=$(JAVAROOT):$(srcdir)/$(JAVAROOT):$$CLASSPATH
+ CLASSPATH_ENV = CLASSPATH=$(JAVAROOT):$(srcdir)/$(JAVAROOT)$${CLASSPATH:+":$$CLASSPATH"}
  JAVAROOT = $(top_builddir)
 +endif %?FIRST%
  
 -class%DIR%.stamp: $(%DIR%_JAVA)
 +class%NDIR%.stamp: $(am__java_sources)
        @list1='$?'; list2=; if test -n "$$list1"; then \
          for p in $$list1; do \
            if test -f $$p; then d=; else d="$(srcdir)/"; fi; \

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge

diff --cc tests/defs.in
Simple merge