Merge branch 'maint' into master

[Stefano Lattarini]

commit 3749d843083e552232579a85288e7dfee126ad91
Merge: 72c8dcb 3c5d083
Author:     Stefano Lattarini <stefano.lattar...@gmail.com>
AuthorDate: Fri Dec 23 00:44:34 2011 +0100
Commit:     Stefano Lattarini <stefano.lattar...@gmail.com>
CommitDate: Fri Dec 23 00:44:34 2011 +0100

    Merge branch 'maint'

    * maint:
      tests: avoid spurious failure of libtool and gettext tests