More desktop file merges.
More desktop file merges.

svn path=/branches/kdepim/enterprise/kdepim/; revision=709488

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