Conflicts:
	akregator/src/speechclient.cpp
	blogilo/src/composer/bilbobrowser.h
	kmail/editor/kmcomposereditor.cpp
	messagecore/widgets/annotationdialog.cpp
	plugins/messageviewer/bodypartformatter/delegateselector.cpp
	plugins/messageviewer/bodypartformatter/text_vcard.cpp