some more accel conflicts
some more accel conflicts

svn path=/trunk/kdenetwork/kmail/; revision=172246

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