grmbl, fix uncompileable (-> untested) merge
grmbl, fix uncompileable (-> untested) merge

svn path=/branches/KDE/3.5/kdepim/; revision=802449

lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi