SVN_MERGE: Merged revisions 1105246 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
........
r1105246 | mutz | 2010-03-19 17:39:42 +0100 (Fri, 19 Mar 2010) | 1 line KeyCache: add enableFileSystemWatcher(bool) to temporarily suppress them, and rename startKeyListing() to reload() with an optional GpgME::Protocol parameter (currently unused)
........
svn path=/trunk/KDE/kdepim/kleopatra/; revision=1109588