Merge branch 'master' of ssh://repo.or.cz/srv/git/Worg
authorBastien Guerry <bzg@altern.org>
Thu, 18 Aug 2011 16:43:03 +0000 (18:43 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 18 Aug 2011 16:43:03 +0000 (18:43 +0200)

Trivial merge