Cleanup and make it work.
Cleanup and make it work.

svn path=/branches/kdepim/proko2/kdepim/; revision=596696

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