SVN_MERGE

Merged revisions 1047012,1047162,1047168,1047218 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

................
  r1047012 | mlaurent | 2009-11-10 10:36:34 +0100 (Tue, 10 Nov 2009) | 2 lines
  
  Remove my old debug
................
  r1047162 | tokoe | 2009-11-10 17:16:46 +0100 (Tue, 10 Nov 2009) | 4 lines
  
  Cut out entities will be shown as inactive
  
  BUG: 213466
................
  r1047168 | skelly | 2009-11-10 17:26:45 +0100 (Tue, 10 Nov 2009) | 1 line
  
  Partial revert of patch from tokoe. Keep Items and Collections separate.
................
  r1047218 | winterz | 2009-11-10 19:05:52 +0100 (Tue, 10 Nov 2009) | 17 lines
  
  Merged revisions 1047215 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
  
  ................
    r1047215 | winterz | 2009-11-10 13:02:53 -0500 (Tue, 10 Nov 2009) | 10 lines
    
    Merged revisions 1047211 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1047211 | winterz | 2009-11-10 12:58:55 -0500 (Tue, 10 Nov 2009) | 3 lines
      
      make wording on the '[Record]' buttons more consistent.
      MERGE: e4,trunk
    ........
  ................
................

svn path=/branches/work/akonadi-ports/kdepimlibs/; revision=1047392