[FYI] Merge branch 'maint' into master

[Stefano Lattarini]

commit 4aba4155a763f0f6813daa0ad2521ebb9960a784
Merge: a23d5bd 05c0298
Author:     Stefano Lattarini <address@hidden>
AuthorDate: Sun Jan 15 17:40:09 2012 +0100
Commit:     Stefano Lattarini <address@hidden>
CommitDate: Sun Jan 15 17:40:09 2012 +0100

    Merge branch 'maint'

    * maint:
      gnupload: moved to gnulib
      sync: gitlog-to-changelog from gnulib upstream
      test defs: backport optimized 'using_gmake' implementation
      tests: unify some tests on "make -n", reducing duplication
      vala: use "$(am__cd) $(srcdir)", not "cd $(srcdir)"

    + Extra edits:

    * tests/maken3.test: Carry over (with necessary adjustments) the
    code from maken4.test that determines whether $MAKE supports the
    special '.MAKE' target.