Revert till's glitch when merging from the proko branch.
Revert till's glitch when merging from the proko branch.

svn path=/trunk/kdepim/; revision=346511

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