SVN_MERGE

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

........
  r1069507 | tilladam | 2010-01-03 16:40:58 +0100 (Sun, 03 Jan 2010) | 1 line
  
  Propagate the external exit of the akonadi server as an error to the runner, to give it a chance to shut down more or less cleanly.
........

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