[Frugalware-git] melkotesting: Merge remote-tracking branch 'current/master'

[Melko]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=melkotesting.git;a=commitdiff;h=2043b4a93027b275c498888ef69b08262806333e

commit 2043b4a93027b275c498888ef69b08262806333e
Merge: b6f9182 3d9438f
Author: Melko <melko at frugalware.org>
Date:   Sun Apr 15 10:59:01 2012 +0200

Merge remote-tracking branch 'current/master'

Conflicts:
source/kde-extra/calligra/FrugalBuild