SVN_MERGE

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

........
  r1041338 | mlaurent | 2009-10-27 21:42:09 +0100 (Tue, 27 Oct 2009) | 2 lines
  
  Fix order
........
  r1042253 | mlaurent | 2009-10-29 12:53:11 +0100 (Thu, 29 Oct 2009) | 2 lines
  
  Reenable when we remove last item in favoritefolderview
........

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