Backport of rev 857017
Backport of rev 857017

svn path=/branches/KDE/4.1/kdepim/; revision=863842

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