[vala/f14/master: 4/4] Merge commit '73b8ed6e5c2b5f204fdfe07fb78629da9d817780' into f14

[Michel Alexandre Salim]

commit 68221dfc2cab297004c041213c4f25b5d870b0d3
Merge: 423b041 73b8ed6
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Wed Oct 20 11:37:13 2010 +0200

    Merge commit '73b8ed6e5c2b5f204fdfe07fb78629da9d817780' into f14
    
    Conflicts:
    	vala.spec

 .gitignore |    1 +
 sources    |    2 +-
 vala.spec  |   14 +++++++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)
---