David Faure ca9720b3d8 Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks
Conflicts:
	CMakeLists.txt
	kdeui/actions/kaction.cpp
	tier1/solid/src/solid/powermanagement.cpp
2012-06-26 19:27:14 +02:00
..
2012-04-28 13:17:42 +02:00
2008-11-07 18:04:32 +00:00
2012-04-28 13:17:42 +02:00
2009-09-13 17:17:02 +00:00
2012-06-08 17:33:16 +02:00