Merged revisions 969788 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
........
r969788 | winterz | 2009-05-19 00:12:47 +0200 (Tue, 19 May 2009) | 4 lines replace non-Oxygen icon "gpg" with Oxygen icon "document-encrypt" MERGE: trunk
........
svn path=/trunk/KDE/kdepim/kleopatra/; revision=970656