[vala/el6/master: 4/4] Merge branch 'f14' into el6

[Michel Alexandre Salim]

commit 3fbf9ea26546e0b23d5462641c089724dacd3f6e
Merge: 5ffd445 6a5f4b4
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Fri Nov 12 20:20:31 2010 +0100

    Merge branch 'f14' into el6

 .gitignore |    3 +--
 sources    |    2 +-
 vala.spec  |   43 ++++++++++++++++++++++++++++---------------
 3 files changed, 30 insertions(+), 18 deletions(-)
---