Merged revisions 985142 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs
........
r985142 | cberzan | 2009-06-22 11:13:12 +0200 (Mon, 22 Jun 2009) | 2 lines Add inbox, drafts, trash, templates, as well as tentative support for custom folders. The collection names (as well as the names of the folders in the maildir) are hardcoded to English -- i18n will be handled with EntityDisplayAttributes.
........
svn path=/branches/work/akonadi-ports/kdepimlibs/; revision=986730