Commit these files, no idea why svnmerge didn't do that.
svn path=/trunk/KDE/kdepimlibs/; revision=822828