Forward port of SVN commit 552548 by burghard:
Forward port of SVN commit 552548 by burghard:

It is too risky to delete the new folder in case the undo did not work

svn path=/trunk/KDE/kdepim/; revision=553372

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