Git commit 455b468c44e1f382f5ff92a67dc693960703521e by Albert Astals Cid.
Committed on 30/11/2012 at 23:18.
Pushed by aacid into branch 'KDE/4.10'.

Merge remote-tracking branch 'origin/KDE/4.9' into KDE/4.10

Conflicts:
	cmake/modules/KDE4Defaults.cmake


http://commits.kde.org/kdelibs/455b468c44e1f382f5ff92a67dc693960703521e