SVN_MERGE

Merged revisions 1053966,1053977 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

........
  r1053966 | vkrause | 2009-11-25 08:56:02 +0100 (Wed, 25 Nov 2009) | 3 lines
  
  Use session id if provided manually, fixes a bunch of resource hangs and
  about 50 unit tests.
........
  r1053977 | vkrause | 2009-11-25 09:46:30 +0100 (Wed, 25 Nov 2009) | 2 lines
  
  fix overload warning, init() changed in the base class
........

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