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

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

    Merge branch '1.0'