Merged revisions 985158 via svnmerge from

svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r985158 | cberzan | 2009-06-22 11:45:53 +0200 (Mon, 22 Jun 2009) | 2 lines
  
  pretty icons for the local folders
........

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