From: Frederik Gladhorn <gladhorn@kde.org>
Date: Mon, 31 May 2010 09:41:08 +0000 (+0000)
Subject: merge revision 1129280:1132534 from 4.5 branch
X-Git-Tag: v4.5.80~13
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=4252812e1128d69615f230956c100e4cab473627;p=libqmvoc.git

merge revision 1129280:1132534 from 4.5 branch

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=1132725
---

4252812e1128d69615f230956c100e4cab473627