[Frugalware-git] ryuotesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

[bouleetbil]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting.git;a=commitdiff;h=d0d90c35e7a5b30249959d9d9b0a1e1c42baed02

commit d0d90c35e7a5b30249959d9d9b0a1e1c42baed02
Merge: b722796 ff32cf9
Author: bouleetbil <bouleetbil at frogdev.info>
Date:   Sat Nov 5 12:45:42 2011 +0100

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

Conflicts:
source/x11-extra/epplet-base/FrugalBuild