Merge branch 'KDE/4.10'

Conflicts:
	kwin/glxbackend.cpp
This commit is contained in:
Fredrik Höglund 2013-04-09 20:12:07 +02:00
commit e4d60089c8

Diff content is not available