backport SVN commit 830558 by winterz:
backport SVN commit 830558 by winterz:

make sure that changes to the xml file are merged in.
this seems to fix the saving of shortcut changes in the kmail component.

svn path=/branches/KDE/4.1/kdepim/; revision=830690

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