68a5188 Merge branch 'master' into f19

Merged and Committed by Colin Walters 10 years ago
    Merge branch 'master' into f19
    
    Conflicts:
    	dbus.spec
    
        
file modified
+1 -0
file modified
+6 -2
file modified
+1 -1