SVN_MERGE: Merged revisions 1141636 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
........
r1141636 | mutz | 2010-06-23 08:07:38 +0200 (Wed, 23 Jun 2010) | 1 line kleopatra_signencryptfiles.desktop: use "Sign & Encrypt", not "Encrypt & Sign", for consistency
........
svn path=/trunk/KDE/kdepim/kleopatra/; revision=1144204