 -- merging .desktop file for kresources/scalix.
 -- merging .desktop file for kresources/scalix.

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

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