SVN_MERGE

Merged revisions 1147405,1148470,1149845,1152102 via svnmerge from 
svn+ssh://vkrause@svn.kde.org/home/kde/branches/KDE/4.5/kdepimlibs

........
  r1149845 | tilladam | 2010-07-14 14:47:29 +0200 (Wed, 14 Jul 2010) | 1 line
  
  Use the new descendants proxy, it's more correct.
........
  r1152102 | mlaurent | 2010-07-20 12:17:19 +0200 (Tue, 20 Jul 2010) | 2 lines
  
  Allow to compile with kde-4.4
........

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