aef8f40 Merge branch 'f20'

Merged and Committed by Rex Dieter 10 years ago
    Merge branch 'f20'
    
    Conflicts:
    	PackageKit.spec
    
    I assume we want to keep these branches mergeable, so here we are.
    
        
file modified
+8 -1