Revert r827377 (the commit that reverted the kleo merge). Now everything is back to the way it was before I started this mess today.
The problem I couldn't overcome was that svn diff / patch don't deal with
deleted,added and moved files properly.
Maybe I'll start another attempt using svn merge (not svnmerge), but not
today.
svn path=/trunk/KDE/kdepim/kleopatra/uiserver/; revision=827403