SVN_MERGE

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

........
  r1036757 | tmcguire | 2009-10-17 20:18:31 +0200 (Sat, 17 Oct 2009) | 3 lines
  
  Add a test: Multipart appends with invalid connections will confuse the server
  and the client.
........
  r1036760 | tmcguire | 2009-10-17 20:28:45 +0200 (Sat, 17 Oct 2009) | 1 line
  
  Opps, fix the test.
........

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