whoopsie, forgot this MERGE: e4
whoopsie, forgot this
MERGE: e4

svn path=/branches/kdepim/enterprise/kdepim/; revision=1008005

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