SVN_MERGE
SVN_MERGE

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

........
  r1047117 | osterfeld | 2009-11-10 15:29:08 +0100 (Tue, 10 Nov 2009) | 2 lines
  
  don't crash on exit
........

svn path=/trunk/KDE/kdepim/; revision=1061122

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