From: Frederik Gladhorn <gladhorn@kde.org>
Date: Wed, 4 Jun 2008 11:38:51 +0000 (+0000)
Subject: more merging
X-Git-Tag: v4.1.80~41^2~10
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=94e3b3ee730b94a67eeeba5e4f846a91d6f4e3db;p=libqmvoc.git

more merging

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

94e3b3ee730b94a67eeeba5e4f846a91d6f4e3db