51de1c0 Merge branch 'f15'

Merged and Committed by tbzatek 13 years ago
    Merge branch 'f15'
    
    Conflicts:
    	.gitignore
    	gobject-introspection.spec
    	sources
    
        
file modified
+4 -10
file modified
+23 -7
file modified
+1 -1