SVN_MERGE

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

........
  r1046780 | mlaurent | 2009-11-09 18:33:24 +0100 (Mon, 09 Nov 2009) | 2 lines
  
  Minor
........
  r1047014 | vkrause | 2009-11-10 10:40:26 +0100 (Tue, 10 Nov 2009) | 2 lines
  
  Removed in trunk long ago, and no longer used here either.
........
  r1047135 | skelly | 2009-11-10 16:03:43 +0100 (Tue, 10 Nov 2009) | 1 line
  
  Add crash guard.
........

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