commit 55d6b31422a71ec9e7fb6b19c5df9b285f796cad
Merge: 9081e65 bffab1b
Author: Mantia Andras <amantia@kde.org>
Date:   Wed Jul 7 18:35:24 2010 +0300

    Merge branch '1.0'