[FYI] Merge branch 'maint' into master

[Stefano Lattarini]

commit b8c7e3f7ebf3ff8841b6bc1d224bbc87d71261ff
Merge: 2674291 454a1ac
Author: Stefano Lattarini <stefano.lattar...@gmail.com>
Date:   Fri Dec 14 15:43:27 2012 +0100

    Merge branch 'maint'

    * maint:
      sync: update files from upstream with "make fetch"
      gitignore: align with recent changes
      fixup: add dummy rule for ChangeLog generation in Makefile.am
      maint: no longer use AM_MAKEFLAGS in maintainer rules
      maint: use more GNU make features in maintainer rules
      maint: move maintainer make rules in maint.mk