merge SVN commit 1004765 by tmcguire from trunk to e35:
merge SVN commit 1004765 by tmcguire from trunk to e35:

Make it work properly, before it quoted the wrong message.

Makes me wonder why it does work in e35 and e4, but probably because the composer can't change
the template there.


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

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