SVN_MERGE
Merged revisions 1031834-1031835,1031856,1031977 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
........
r1031834 | skelly | 2009-10-06 10:48:14 +0200 (Tue, 06 Oct 2009) | 1 line Use the Akonadi::SelectionProxyModel in AkonadiConsole with lazy population.
........
r1031835 | scripty | 2009-10-06 10:48:34 +0200 (Tue, 06 Oct 2009) | 1 line SVN_SILENT made messages (.desktop file)
........
r1031856 | skelly | 2009-10-06 11:50:07 +0200 (Tue, 06 Oct 2009) | 1 line Build fix.
........
r1031977 | vkrause | 2009-10-06 17:26:35 +0200 (Tue, 06 Oct 2009) | 4 lines Don't get stuck if we encounter an unknown collection attribute. CCBUG: 208555
........
svn path=/branches/work/akonadi-ports/kdepim/; revision=1032182