[FYI] Merge branch 'maint' into master

[Stefano Lattarini]

commit 326ff45b8da46ab409b4a69d4861ad3211f0e132
Merge: 6e249ed 54ac5d4
Author: Stefano Lattarini <stefano.lattar...@gmail.com>
Date:   Thu Apr 12 18:04:19 2012 +0200

    Merge branch 'maint'

    * 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>