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

[jercel]

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

commit cc055d24e2642eee269d697d767f0d86f0fa76db
Merge: c0e4212 0194852
Author: jercel <jercel16 at gmail.com>
Date:   Wed Mar 23 19:52:18 2011 +0100

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