SVN_MERGE

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

........
  r1068512 | vkrause | 2010-01-01 12:39:26 +0100 (Fri, 01 Jan 2010) | 2 lines
  
  Fix D-Bus setup on Linux, hopefully without breaking Mac again.
........
  r1069498 | vkrause | 2010-01-03 16:22:37 +0100 (Sun, 03 Jan 2010) | 2 lines
  
  we don't need any of those here
........

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