Merge branch 'KDE/4.11'

Conflicts:
kcontrol/desktoppaths/desktoppath.desktop
kcontrol/desktoptheme/desktoptheme.desktop
kcontrol/input/cursortheme.desktop
ksmserver/themes/contour/metadata.desktop
ksmserver/themes/default/metadata.desktop
ksplash/kcm/ksplashthememgr.desktop
kstyles/themes/mega.themerc
libs/ksysguard/processui/ProcessWidgetUI.ui
libs/ksysguard/processui/ksysguardprocesslist.cpp
libs/taskmanager/taskactions.cpp
plasma/generic/runners/solid/plasma-runner-solid.desktop
solid-actions-kcm/device-actions/solid-device-OpticalDrive.desktop
solid-actions-kcm/device-actions/solid-device-StorageDrive.desktop