SVN_MERGE

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

........
  r1057180 | osterfeld | 2009-12-01 17:50:49 +0100 (Tue, 01 Dec 2009) | 2 lines
  
  Display full collection paths in the combobox, so one can distinguish identically named collections
........

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