Aaron Seigo 05834d8144 Merge remote-tracking branch 'origin/master' into libplasma2
Conflicts:
	plasma/CMakeLists.txt
	plasma/abstractrunner.h
	plasma/animator.h
	plasma/glapplet.h
	plasma/package.h
	plasma/packagemetadata.h
	plasma/packagestructure.h
	plasma/tooltipcontent.cpp
	plasma/tooltipcontent.h
	plasma/wallpaper.h
2011-07-11 21:56:41 +02:00
..
2009-10-09 20:07:44 +00:00
2010-01-18 18:24:57 +00:00
2011-05-31 01:26:09 +02:00
2011-05-26 16:02:56 +02:00