Merged revisions 1056468,1056473,1056482,1056597,1056626,1056728 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

................
  r1056468 | djarvie | 2009-11-30 11:15:20 +0100 (Mon, 30 Nov 2009) | 2 lines
  
  Fix parent class reference
................
  r1056473 | djarvie | 2009-11-30 11:25:34 +0100 (Mon, 30 Nov 2009) | 2 lines
  
  Remove redundant line
................
  r1056482 | djarvie | 2009-11-30 11:46:54 +0100 (Mon, 30 Nov 2009) | 2 lines
  
  Fix adherence to schema
................
  r1056597 | scripty | 2009-11-30 13:33:38 +0100 (Mon, 30 Nov 2009) | 1 line
  
  SVN_SILENT made messages (.desktop file)
................
  r1056626 | winterz | 2009-11-30 14:31:12 +0100 (Mon, 30 Nov 2009) | 17 lines
  
  Blocked revisions 1056623 via svnmerge
  SVN_SILENT:
  
  ................
    r1056623 | winterz | 2009-11-30 08:23:40 -0500 (Mon, 30 Nov 2009) | 10 lines
    
    Merged revisions 1056612 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1056612 | winterz | 2009-11-30 07:57:26 -0500 (Mon, 30 Nov 2009) | 3 lines
      
      crash guard if the mimetype for the invitation attachment is empty.
      MERGE: e4 (already in trunk)
    ........
  ................
................
  r1056728 | mlaurent | 2009-11-30 18:42:37 +0100 (Mon, 30 Nov 2009) | 3 lines
  
  SVN_SILENT:
  fix typo
................

svn path=/branches/work/akonadi-ports/kdepim/; revision=1056936