MERGE: 4.3

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

........
  r1010100 | tilladam | 2009-08-11 18:06:53 +0200 (Tue, 11 Aug 2009) | 9 lines
  
  Move the PluginEntry class which is defined within the cpp file into the
  Akonadi namespace, as it clashes with a class of the same name in
  kdelibs (in the plugin loading code) on OSX (at least). The effect
  is that the wrong symbol is found at object instantiation time and
  all hell breaks loose, including gdb giving up the ghost.
  
  This is the second time we've run into this, luckily this time
  Volker and me remembered the problem so it didn't take days to
  find, like last time ...
........

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