SVN_MERGE

Merged revisions 1047794,1047798,1047981,1048055 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

........
  r1047794 | mlaurent | 2009-11-12 09:27:40 +0100 (Thu, 12 Nov 2009) | 2 lines
  
  Add missing i18n
........
  r1047798 | tokoe | 2009-11-12 09:41:16 +0100 (Thu, 12 Nov 2009) | 2 lines
  
  add apidocs
........
  r1047981 | guymaurel | 2009-11-12 15:15:50 +0100 (Thu, 12 Nov 2009) | 1 line
  
  complete with some more parentheses (#2128)
........
  r1048055 | winterz | 2009-11-12 18:27:56 +0100 (Thu, 12 Nov 2009) | 3 lines
  
  fix holiday for Epifanía, per Xavier
  MERGE: 4.3
........

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