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

[Michel Alexandre Salim]

commit ff9a92ea6ae564d96296bfd18e3dad93c7df292f
Merge: 3c0fa6f 69d3433
Author: Michel Alexandre Salim <michel at iris.localdomain>
Date:   Sun Sep 12 15:42:13 2010 +0200

    Merge branch 'master' into el6

 .gitignore |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---