merge bleeding edge. bleeding edge is now again dead
svn path=/trunk/KDE/kdebase/workspace/kcontrol/krdb/; revision=558082