SVN_MERGE

Merged revisions 1043875,1044146 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

........
  r1043875 | vkrause | 2009-11-02 16:19:52 +0100 (Mon, 02 Nov 2009) | 3 lines
  
  A resource should not try to retrieve items from itself here, could led
  to an infinite recursion.
........
  r1044146 | tokoe | 2009-11-03 09:44:48 +0100 (Tue, 03 Nov 2009) | 2 lines
  
  If no right restriction is given, always return true
........

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