6113138 Merge remote-tracking branch 'origin/master' into f18

Merged and Committed by jwrdegoede 11 years ago
    Merge remote-tracking branch 'origin/master' into f18
    
    Conflicts:
    	spice-gtk.spec
    
        
file modified
+6 -4