From: Frederik Gladhorn <gladhorn@kde.org>
Date: Sat, 17 May 2008 12:05:44 +0000 (+0000)
Subject: merge trunk to soc branch
X-Git-Tag: v4.1.80~41^2~13
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=be076469745d465cb10738abb2e50ce4354f55a1;p=libqmvoc.git

merge trunk to soc branch

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

be076469745d465cb10738abb2e50ce4354f55a1