From: Frederik Gladhorn <gladhorn@kde.org>
Date: Wed, 4 Jun 2008 11:05:42 +0000 (+0000)
Subject: merge in trunk
X-Git-Tag: v4.1.80~41^2~11
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=a5240f18fd076b21a64a9e4785b5cf84ab2718a7;p=libqmvoc.git

merge in trunk

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

a5240f18fd076b21a64a9e4785b5cf84ab2718a7