[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=15f7bdc5f4fae0f13beadd319f2c17cc38c66dd1

commit 15f7bdc5f4fae0f13beadd319f2c17cc38c66dd1
Merge: 937c6e7 8cf4f98
Author: bouleetbil <bouleetbil at frogdev.info>
Date:   Mon Nov 22 21:11:22 2010 +0000

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