David Faure c7ab521ee7 Merge remote-tracking branch 'origin/KDE/4.7' into origin-frameworks
Conflicts:
	experimental/libkactivities/
	plasma/applet.h
	plasma/theme.cpp
	staging/libkcoreaddons/src/jobs/kjob.cpp
2011-12-08 19:06:24 +01:00
..
2011-05-31 00:03:39 +02:00
2011-05-31 01:00:35 +02: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
2011-06-09 12:46:25 +02:00
2011-06-09 12:46:25 +02:00