Summary of changes: fc53a24... kcm_colors: avoid conflict with plasma-desktop (*) 9cbcd19... Merge branch 'f21' into f20 (*) This commit already existed in another branch; no separate mail sent