commit 9081e65a9ea72829a13d66ad2bd1d2445c80a5e8
Merge: 97554eb 8a2ab12
Author: Mantia Andras <amantia@kde.org>
Date:   Wed Jul 7 11:29:24 2010 +0300

    Merge branch '1.0'