SVN_MERGE

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

........
  r1067025 | vkrause | 2009-12-28 20:05:37 +0100 (Mon, 28 Dec 2009) | 4 lines
  
  Surprising how well HRID-based resources worked so far, given that most
  commands simply ignored the ancestor chain and used plain RIDs instead
  for addressing objects...
........
  r1067047 | vkrause | 2009-12-28 20:52:46 +0100 (Mon, 28 Dec 2009) | 9 lines
  
  Add some more safeguards:
  - don't crash when moving a collection to a not yet existing parent, real
    fix is rather complicated and still pending though (defering the move
    until the needed local ancestors have been created)
  - in some cases (misbehaving resources or the above workaround) we might
    end up with unprocessed local nodes that have processed children,
    exclude those from deletion in non-incremental mode to avoid possible
    data loss
........

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