SVN_MERGE

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

........
  r1068548 | tmcguire | 2010-01-01 15:14:39 +0100 (Fri, 01 Jan 2010) | 1 line
  
  Use libakonadi (verbose) debug area here
........
  r1068711 | tmcguire | 2010-01-01 22:31:51 +0100 (Fri, 01 Jan 2010) | 1 line
  
  Remove the kdebug altogether.
........

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