SVN_MERGE

Merged revisions 1029242-1029243,1029267,1029330 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

........
  r1029242 | skelly | 2009-09-29 12:11:13 +0200 (Tue, 29 Sep 2009) | 1 line
  
  Fetch resource trees into ETM if they are monitored explicitly. Enables virtual collections/resources.
........
  r1029243 | skelly | 2009-09-29 12:11:18 +0200 (Tue, 29 Sep 2009) | 1 line
  
  Use a queued connection in the state saver to delay restoration a bit.
........
  r1029267 | skelly | 2009-09-29 13:38:42 +0200 (Tue, 29 Sep 2009) | 3 lines
  
  Initialize the currentIndex key and store a negative key for invalid indexes.
  
  This should fix the KAddressBook phantom contacts issue.
........
  r1029330 | dfaure | 2009-09-29 16:58:28 +0200 (Tue, 29 Sep 2009) | 3 lines
  
  Because the 3 korganizer plugins share the same part, we need to switch
  that part's XML files every time we are about to show its GUI.
........

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