SVN_MERGE

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

........
  r1030617 | tmcguire | 2009-10-02 20:50:42 +0200 (Fri, 02 Oct 2009) | 1 line
  
  Use 'Local Folders' instead of 'local-mail' for the name of the agent instance.
........
  r1030629 | tmcguire | 2009-10-02 21:58:51 +0200 (Fri, 02 Oct 2009) | 3 lines
  
  Upps, take into account that the root collection is now always translated.
  Fixed the crashes and also the unit tests.
........

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