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

................
  r1015875 | tmcguire | 2009-08-26 15:49:42 +0200 (Wed, 26 Aug 2009) | 10 lines
  
  Merged revisions 1015834 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r1015834 | tmcguire | 2009-08-26 14:24:04 +0200 (Wed, 26 Aug 2009) | 3 lines
    
    Fix Till's todo: Also take local folders into account when collecting the resource folders.
    Fixes kolab/issue3792.
  ........
................

svn path=/trunk/KDE/kdepim/; revision=1021515

lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi