[FYI] Merge branch 'maint' into master

[Stefano Lattarini]

commit 7411adcdad588acf2a167dd05e5a942fa752e90e
Merge: 154fedb b8651af
Author: Stefano Lattarini <address@hidden>
Date:   Tue Oct 2 20:34:47 2012 +0200

    Merge branch 'maint'

    * maint:
      config headers: remove stale comment in makefile fragment
      NEWS: wording and quoting fixlets in few older entries
      config headers: don't emit rules for headers not generated by autoheader
      docs: fix minor typo: s/expending/expanding/
      sync: update files from upstream with "make fetch"
      maint: post-release minor version bump
      maint: typo fixes s/lies into/lies in/
      release: stable release 1.12.4
      NEWS: minor fix

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