[Automake-NG] [FYI] Merge branch 'master' into ng/master

[Stefano Lattarini]

commit 10a1f8b1d17cf1602819fb93a758f3102e737d6e
Merge: 87b62c3 a5ed87e
Author: Stefano Lattarini <address@hidden>
Date:   Thu Feb 21 18:12:27 2013 +0100

    Merge branch 'master' into ng/master

    * master:
      maint: more adjustments to the new versioning scheme
      aclocal: fix for more-than-once specified directories
      aclocal: just warn if the primary local m4 dir doesn't exist (don't error)
      coverage: expose automake bug#13760
      tests: refactor/enhance tests about make dry-run mode
      maint: describe new versioning and branching scheme, and adjust to it
      cosmetics: fix some "docstring-like" comments in automake

    + t/make-dryrun.tap: Several adjustments, since this test had diverged
    quite significantly from the version in mainline Automake.  Particularly
    relevant is the fact that Automake-NG seems immune to bug#13760, so that
    some tests that are returning XFAIL in mainline automake succeeds for
    Automake-NG.

    Signed-off-by: Stefano Lattarini <address@hidden>