From: Frederik Gladhorn <gladhorn@kde.org>
Date: Sat, 24 May 2008 20:01:03 +0000 (+0000)
Subject: merge trunk
X-Git-Tag: v4.1.80~41^2~12
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=ff099eecb769a90f185f165c75eda4962fdcf140;p=libqmvoc.git

merge trunk

svn path=/branches/work/soc-parley/libkdeedu/; revision=812200
---

ff099eecb769a90f185f165c75eda4962fdcf140