Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
	agents/archivemailagent/archivemailinfo.cpp
	agents/archivemailagent/archivemailmanager.cpp
	kaddressbook/xxport/vcard/vcard_xxport.cpp
	messagecomposer/attachment/attachmentcontrollerbase.cpp

identity/identityaddvcarddialog.cpp

@@ -62,7 +62,7 @@ IdentityAddVcardDialog::IdentityAddVcardDialog(const QStringList &shadowIdentiti
 
     mVCardPath = new KUrlRequester;
     mVCardPath->setObjectName(QLatin1String("kurlrequester_vcardpath"));
-    const QString filter = i18n( "*.vcf|Vcard (*.vcf)\n*|all files (*)" );
+    const QString filter = i18n( "*.vcf|vCard (*.vcf)\n*|all files (*)" );
     mVCardPath->setFilter(filter);
 
     mVCardPath->setMode(KFile::LocalOnly|KFile::File);