SVN_MERGE

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

........
  r1047464 | osterfeld | 2009-11-11 11:39:24 +0100 (Wed, 11 Nov 2009) | 2 lines
  
  initialize this variable.
........
  r1047554 | osterfeld | 2009-11-11 13:34:23 +0100 (Wed, 11 Nov 2009) | 2 lines
  
  even more sanity-checking
........

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