commit 41a99933719945ff84abc4d7587736be401a5d23
Merge: b9b0cc9 eb83c1f
Author: Hamish Rodda <rodda@kde.org>
Date:   Fri May 7 10:27:49 2010 +1000

    Merge branch 'master' of gitorious.org:kdevelop/kdevelop