SVN_MERGE: Merged revisions 1095946 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
........
r1095946 | mutz | 2010-02-25 11:54:01 +0100 (Thu, 25 Feb 2010) | 4 lines AddUserIDDialog: enforce the same constraints on an additional user-id than on the initial one in NewCertificateWizard. Lots of code duplication for fixing kolab/issue4154 (gpg4win).
........
svn path=/trunk/KDE/kdepim/kleopatra/; revision=1097976