Backport r964237 by tmcguire from trunk to the 4.2 branch:
Backport r964237 by tmcguire from trunk to the 4.2 branch:

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

................
  r961090 | winterz | 2009-04-29 16:12:37 +0200 (Wed, 29 Apr 2009) | 9 lines
  
  Merged revisions 961003 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r961003 | mlaurent | 2009-04-29 09:05:41 -0400 (Wed, 29 Apr 2009) | 2 lines
    
    More logical
  ........
................


svn path=/branches/KDE/4.2/kdepim/; revision=964268

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