[Frugalware-git] frugalware-current: Merge branch 'master' of git.frugalware.org:/pub/other/people/bouleetbil/bouletmp

[bouleetbil]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=44e0f5fe45df3f8c08954b9898ba96379717adf8

commit 44e0f5fe45df3f8c08954b9898ba96379717adf8
Merge: d7a58a1 917c09f
Author: bouleetbil <bouleetbil at frogdev.info>
Date:   Mon Aug 23 09:58:40 2010 +0000

Merge branch 'master' of git.frugalware.org:/pub/other/people/bouleetbil/bouletmp