SVN_SILENT merge build fixes
Merged revisions 848343-848345 via svnmerge from
https://vkrause@svn.kde.org/home/kde/branches/KDE/4.1/kdepimlibs
........
r848343 | vkrause | 2008-08-17 15:12:04 +0200 (Sun, 17 Aug 2008) | 2 lines missing revert of revision 847080
........
r848345 | vkrause | 2008-08-17 15:13:35 +0200 (Sun, 17 Aug 2008) | 2 lines also build with kdesupport/akonadi from trunk
........
svn path=/branches/kdepim/enterprise4/kdepimlibs/; revision=848594