SVN_MERGE

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

........
  r1035260 | tokoe | 2009-10-14 18:06:53 +0200 (Wed, 14 Oct 2009) | 2 lines
  
  API cleanup for CollectionQuotaAttribute and adaption
........

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