fa77706 Merge branch 'f15'

Merged and Committed by tbzatek 13 years ago
    Merge branch 'f15'
    
    Conflicts:
    	gnome-disk-utility.spec
    
        
file modified
+2 -0
file modified
+13 -5
file modified
+1 -1