Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
authorbouleetbil <bouleetbil@frogdev.info>
Sat, 7 May 2011 12:55:06 +0000 (14:55 +0200)
committerbouleetbil <bouleetbil@frogdev.info>
Sat, 7 May 2011 12:55:06 +0000 (14:55 +0200)

Trivial merge