Merge remote-tracking branch 'origin/KDE/4.10' into origin-frameworks

Conflicts:
	kdeui/colors/kcolorbutton.cpp [ported to QColorDialog, let's hope it handle double-click...]
	kdeui/xmlgui/kxmlguiclient.cpp
	kio/kio/kprotocolmanager.cpp [reverted...]
	kioslave/file/file_unix.cpp [minor]
	plasma/dialog.cpp [gone -> changes ignored]
	plasma/tooltipmanager.cpp [gone -> changes ignored]
This commit is contained in:
David Faure 2012-12-07 16:04:32 +01:00
commit eaa9afe7e6

Diff Content Not Available