SVN_MERGE

Merged revisions 1011330 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/work/akonadi-ports/kdepimlibs

........
  r1011330 | cberzan | 2009-08-14 12:54:03 +0200 (Fri, 14 Aug 2009) | 2 lines
  
  temporary workaround for duplicate-entry problem causing tons of maildir resources to be created.
........

svn path=/trunk/KDE/kdepimlibs/; revision=1011423