Merged revisions 974564 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........

r974564 | winterz | 2009-05-29 18:46:16 +0200 (Fri, 29 May 2009) | 3 lines

put back the gpg icon, now that we have one
MERGE: trunk

........

svn path=/trunk/KDE/kdepim/kleopatra/; revision=977058