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

[Michel Alexandre Salim]

commit 3c0fa6fdd44d4067ce3f228c28e7ce7219423742
Merge: 6b2c71b 0f2d175
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sun Sep 12 15:39:58 2010 +0200

    Merge branch 'f13' into el6
    
    Conflicts:
    	.gitignore
    	sources
    	vala.spec

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