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

[bouleetbil]

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

commit f0d7d45a106730dc02dec0937a44143cea3ddfc1
Merge: cf40706 4d5acbc
Author: bouleetbil <bouleetbil at frogdev.info>
Date:   Sun Jan 16 16:40:06 2011 +0100

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