From kde-commits  Wed Jul 07 17:36:07 2010
From: Mantia Andras <amantia () kde ! org>
Date: Wed, 07 Jul 2010 17:36:07 +0000
To: kde-commits
Subject: [kdevplatform] 9081e65: Merge branch '1.0'
Message-Id: <201007071736.o67Ha7eH009791 () kore ! kollide ! net>
X-MARC-Message: https://marc.info/?l=kde-commits&m=127852512114853

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

    Merge branch '1.0'