Git commit 0ede5f0a1cb26cde619e5d67f064766b9e326cb5 by Giorgos Tsiapaliwkas.
Committed on 02/05/2012 at 09:39.
Pushed by lueck into branch 'master'.

Merge branch 'plasma/terietorANDkokeroulis/KLocaleQMLBindings'
Fix the git conflicts
Conflicts:
	plasma/declarativeimports/CMakeLists.txt
	plasma/declarativeimports/test/contents/ui/Gallery.qml


http://commits.kde.org/konqueror/0ede5f0a1cb26cde619e5d67f064766b9e326cb5