SVN_MERGE
Merged revisions 1070326,1070408 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
........
r1070326 | scripty | 2010-01-05 11:45:18 +0100 (Tue, 05 Jan 2010) | 1 line SVN_SILENT made messages (.desktop file)
........
r1070408 | boiko | 2010-01-05 16:28:39 +0100 (Tue, 05 Jan 2010) | 5 lines Draw the description aligned at top so that if it has more than two lines the additional lines are not drawn BUG: 218103
........
svn path=/branches/work/akonadi-ports/kdepim/; revision=1070630