SVN_MERGE

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

........
  r1033703 | osterfeld | 2009-10-10 22:52:53 +0200 (Sat, 10 Oct 2009) | 2 lines
  
  compile with implicit ascii/qstring conversions disabled
........

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