forwardport Will's patch - hopefully it compiles, my snapshot isn't really uptodate
forwardport Will's patch - hopefully it compiles, my snapshot
isn't really uptodate

svn path=/trunk/KDE/kdepim/; revision=515023

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