Merged revisions 831375 via svnmerge from

svn+ssh://tmcguire@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

........
  r831375 | vkrause | 2008-07-12 17:00:55 +0200 (Sat, 12 Jul 2008) | 4 lines
  
  Add CollectionDisplayAttribute and use it in the collection model. This
  allows to have custom icons and translated labels for special folders
  such as inbox, outbox, etc.
........

svn path=/branches/kdepim/enterprise4/kdepimlibs/; revision=834781