Merge branch 'maint' into master

[Stefano Lattarini]

commit f4298e61d0d9d2a87e8a43edd4aa7133455c5d7b
Merge: 0a9d201 443114b
Author:     Stefano Lattarini <stefano.lattar...@gmail.com>
AuthorDate: Tue Jan 17 15:52:53 2012 +0100
Commit:     Stefano Lattarini <stefano.lattar...@gmail.com>
CommitDate: Tue Jan 17 15:52:53 2012 +0100

    Merge branch 'maint'

    * maint:
      fixup: contrib: really integrate in automake build system