SVN_MERGE

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

........
  r1034992 | mlaurent | 2009-10-14 11:04:53 +0200 (Wed, 14 Oct 2009) | 2 lines
  
  Move registration in own file
........
  r1035072 | mlaurent | 2009-10-14 11:55:43 +0200 (Wed, 14 Oct 2009) | 2 lines
  
  Allow to use or not default page (in kmail we have specific page)
........

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