Aaron Seigo 71d807c353 Merge remote branch 'origin/KDE/4.7' into frameworks ... Conflicts: CMakeLists.txt kio/kfile/kfilemetadatareaderprocess.cpp plasma/CMakeLists.txt plasma/packagestructure.cpp plasma/private/packages.cpp threadweaver/Mainpage.dox		2011-12-04 14:25:38 +01:00
..
plasma.protocol	Merge remote branch 'origin/KDE/4.7' into frameworks	2011-12-04 14:25:38 +01:00