svn path=/trunk/KDE/kdebase/workspace/; revision=919234
Conflicts: kcmkwin/kwincompositing/main.cpp svn path=/trunk/KDE/kdebase/workspace/; revision=911326