SVN_MERGE Merged revisions 1004200,1004627 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
........
r1004200 | mutz | 2009-07-29 17:17:02 +0200 (Wed, 29 Jul 2009) | 1 line Key::mergeWith(): Merge (parts of gpgme_sub_key_t's, too, so we don't lose the is_cardkey state
........
r1004627 | tmcguire | 2009-07-30 18:19:28 +0200 (Thu, 30 Jul 2009) | 1 line Compile with older gpgme versions
........
svn path=/trunk/KDE/kdepimlibs/; revision=1004643