Restore Laurent's changes from r1036638
Restore Laurent's changes from r1036638

svn path=/branches/work/akonadi-ports/kdepim/; revision=1036955

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