merge bleeding edge. bleeding edge is now again dead

Authored by Dirk Mueller <mueller@kde.org>.

Description

merge bleeding edge. bleeding edge is now again dead

svn path=/trunk/KDE/kdebase/workspace/kcontrol/krdb/; revision=558082

Details

Committed
Dirk Mueller <mueller@kde.org>Jul 4 2006, 5:09 PM
Parents
R126:24d327e47b53: merge back from bleedingedge
Branches
Unknown
Tags
Unknown
Dirk Mueller <mueller@kde.org> committed R126:e133e387c30a: merge bleeding edge. bleeding edge is now again dead (authored by Dirk Mueller <mueller@kde.org>).Jul 4 2006, 5:09 PM