[FYI] Merge branch 'maint' into master

[Stefano Lattarini]

commit 18143e7cfe66eaddffa481211ad4e340a11a22f4
Merge: 1efb88c 2f584fa
Author: Stefano Lattarini <stefano.lattar...@gmail.com>
Date:   Sat Nov 17 20:30:11 2012 +0100

    Merge branch 'maint'

    * maint:
      build: fix rebuild rules for Makefile.in and aclocal.m4
      hacking: release procedure: fix order of some steps
      maint: post-release minor version bump
      release: stable release 1.12.5

    Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com>