73c55f7 Merge branch 'master' of ssh://pkgs.fedoraproject.org/kde-settings

Merged and Committed by rdieter 13 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/kde-settings
    
    Conflicts:
    	kde-settings.spec
    
        
file modified
+4 -1