Conflicts:
	CMakeLists.txt
	agents/akonadinepomukfeederagent.desktop
	kresources/kabc/akonadi.desktop
	kresources/kcal/akonadi.desktop
	plugins/akonadi_serializer_kcal.desktop
	resources/gmail/gmailresource.cpp
	resources/gmail/gmailresource.h
	resources/kabc/kabcresource.desktop
	resources/kcal/kcalresource.desktop
	tray/akonaditray.desktop