SVN_MERGE: Merged revisions 1106590 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
........
r1106590 | mutz | 2010-03-23 12:11:25 +0100 (Tue, 23 Mar 2010) | 3 lines SignEncryptEMailConflictDialog: the need for protocol selection has nothing to do with quickMode Fixes kolab/issue4235 (gpg4win2).
........
svn path=/trunk/KDE/kdepim/kleopatra/; revision=1109624