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

[Stefano Lattarini]

commit 1c69ac27654f17a7aefedccc3792c5280c703372
Merge: 9de0c89 54ac5d4
Author: Stefano Lattarini <stefano.lattar...@gmail.com>
Date:   Thu Apr 12 17:47:36 2012 +0200

    Merge branch 'maint' into branch-1.11

    * maint:
      vala: fix distcheck with c/vala mixed projects
      vala: fix vapi files handling
      vala: test vapi files handling (still failing)

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