[vala/el6/master: 32/34] Merge branch 'master' into el6

[Michel Alexandre Salim]

commit 18f65f91d5c49983c0cb4059926b9d41125a1e10
Merge: ff9a92e 0acbc1a
Author: Michel Alexandre Salim <michel at iris.localdomain>
Date:   Sun Sep 12 15:49:08 2010 +0200

    Merge branch 'master' into el6

 vala.spec |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
---