SVN_MERGE

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

........
  r1071460 | tilladam | 2010-01-08 09:06:13 +0100 (Fri, 08 Jan 2010) | 6 lines
  
  Provide a way for the testrunner environment to restart the akonadi
  server.
  
  This allows external termination of the akonadi server process (like
  when it crashes) to be treated as an error, while still allowing unit
  tests that need it to restart the dameon in a controlled way.
........
  r1071461 | tilladam | 2010-01-08 09:06:22 +0100 (Fri, 08 Jan 2010) | 1 line
  
  Port the autoincrement test to the new way of restarting the server.
........

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