Update to reflect latest changes in code
Update to reflect latest changes in code

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

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