backport 1.15.4.1
backport 1.15.4.1

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

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