[FYI] Merge branch 'maint' into branch-1.11

[Stefano Lattarini]

commit 5a8e19cd8e135a641c428822633fd44dee11152e
Merge: 17087f1 1ba50d1
Author:     Stefano Lattarini <stefano.lattar...@gmail.com>
AuthorDate: Sat Nov 5 12:24:29 2011 +0100
Commit:     Stefano Lattarini <stefano.lattar...@gmail.com>
CommitDate: Sat Nov 5 12:24:29 2011 +0100

    Merge branch 'maint' into branch-1.11
    
    * maint:
      maint-mode: fix botched configure messages