SVN_MERGE

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

........
  r1038541 | vkrause | 2009-10-21 13:18:48 +0200 (Wed, 21 Oct 2009) | 2 lines
  
  Fix fallback payload part merging.
........

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