9f010fa Merge branch 'f15'

Merged and Committed by tbzatek 13 years ago
    Merge branch 'f15'
    
    Conflicts:
    	GConf2.spec
    
        
file modified
+1 -0
file modified
+6 -3
file modified
+1 -1