Merge branch 'KDE/4.10'

Conflicts:
	solid/modemmanager-0.4/modemgsmnetworkinterface.cpp
icc-effect-5.14.5
Dan Vrátil 2013-06-10 20:34:32 +02:00
commit 761df7a56f

Diff Content Not Available