Aaron Seigo 2c7751ccef Merge remote-tracking branch 'origin/KDE/4.7' into frameworks
Conflicts:
	CMakeLists.txt
	kio/kio/kfileitem.cpp
	plasma/datacontainer.cpp
	plasma/datacontainer.h
	plasma/private/wallpaper_p.h
	plasma/private/wallpaperrenderthread.cpp
2011-10-30 10:44:59 +01:00
..
2011-05-31 00:03:39 +02:00
2011-05-31 01:00:35 +02:00
2011-08-17 13:12:45 +02:00
2010-10-12 19:33:15 +00:00
2010-09-27 18:16:27 +00:00
2010-01-18 18:24:57 +00:00
2010-02-22 11:21:30 +00:00
2010-07-24 00:52:37 +00:00
2011-05-26 23:13:44 +02:00
2010-11-08 17:25:12 +00:00
2011-08-07 00:50:20 +02:00
2011-06-09 12:46:25 +02:00
2011-06-09 12:46:25 +02:00