SVN_MERGE: Merged revisions 1105244 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
........
r1105244 | mutz | 2010-03-19 17:39:38 +0100 (Fri, 19 Mar 2010) | 1 line Kleo::Command: fix enum value collision
........
svn path=/trunk/KDE/kdepim/kleopatra/; revision=1109584