SVN_MERGE

Merged revisions 1013695 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/branches/work/akonadi-ports/kdepimlibs

........
  r1013695 | cberzan | 2009-08-20 15:27:56 +0200 (Thu, 20 Aug 2009) | 3 lines
  
  The maildir resource renames its root collection to the resource name. Therefore, make the resource name and the maildir root collection name the same.
  Also provide an icon for the root maildir resource, and some i18n fixes.
........

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