SVN_MERGE

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

........
  r1073040 | cgiboudeaux | 2010-01-11 14:16:19 +0100 (Mon, 11 Jan 2010) | 1 line
  
  Look for Nepomuk in the main CMakeLists.txt
........

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