revert so I can fix my last svnmerge
revert so I can fix my last svnmerge

svn path=/branches/kdepim/enterprise4/kdepim/; revision=1015923

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