From: Frederik Gladhorn <gladhorn@kde.org>
Date: Sun, 15 Jun 2008 16:38:33 +0000 (+0000)
Subject: merge trunk
X-Git-Tag: v4.1.80~41^2~7
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=9f2958fe6f834a309f0a794e7acf44fc71f729b3;p=libqmvoc.git

merge trunk

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

9f2958fe6f834a309f0a794e7acf44fc71f729b3