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