SVN_MERGE

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

........
  r1035536 | mlaurent | 2009-10-15 12:12:58 +0200 (Thu, 15 Oct 2009) | 8 lines
  
  Add active icon (when we have an unread mail in folder)
  put code in statisticsproxymodel.cpp bdisplayIconNamedisplayIconNameecause entitytreemodel can be use
  in korganizer and this code is not necessary in korganizer.
  Update unittest
  Add a function in collectionutils_p.h "displayIconName" to display
  good kicon if we have email
........

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