Commit f64cc0d2b2ac5d3579c1916a10999561d2a36a58
2011-09-20T20:47:41
Merge branch 'master' into test-protocols * master: docs: remove mention of deprecated option `--acdir' fix: cleanup NEWS after botched merges fix: typo in NEWS docs: document planned precedence changes in aclocal search path aclocal: handle ACLOCAL_PATH environment variable tests: fix spurious failure in 'primary-prefix-valid-couples.test' docs: deprecate JAVA primary docs: clearer distinction between `.java' with javac and with gcj java: complain if java_JAVA is used but $(javadir) is undefined