ceda380 Merge branch 'master' into f16

Merged and Committed by Ignacio Casal Quinteiro 12 years ago
    Merge branch 'master' into f16
    
    Conflicts:
    	libpeas.spec
    
        
file modified
+1 -0
file modified
+7 -3
file modified
+1 -1