SVN_MERGE

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

........
  r1057492 | tilladam | 2009-12-02 16:52:04 +0100 (Wed, 02 Dec 2009) | 1 line
  
  Use the right export macro.
........
  r1057500 | tilladam | 2009-12-02 17:34:44 +0100 (Wed, 02 Dec 2009) | 1 line
  
  fix the include
........
  r1059747 | vkrause | 2009-12-07 10:57:31 +0100 (Mon, 07 Dec 2009) | 1 line
  
  build on Windows
........

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