SVN_MERGE

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

........
  r1037075 | tmcguire | 2009-10-18 13:20:15 +0200 (Sun, 18 Oct 2009) | 2 lines
  
  Make some new API private, as per review.
........
  r1037079 | tmcguire | 2009-10-18 13:22:33 +0200 (Sun, 18 Oct 2009) | 2 lines
  
  Rename the private header file.
........

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