SVN_MERGE

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

........
  r1036680 | mlaurent | 2009-10-17 17:53:36 +0200 (Sat, 17 Oct 2009) | 2 lines
  
  Collection -> Folder (as other i18n)
........
  r1038885 | mlaurent | 2009-10-22 10:17:17 +0200 (Thu, 22 Oct 2009) | 2 lines
  
  add missing i18n
........

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