Forward port of ...
Forward port of ...

SVN commit 627548 by winterz:

somehow this part of the templates feature merge got lost


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

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