Merge branch 'master' of ssh://repo.or.cz/srv/git/Worg
authorBastien Guerry <bzg@altern.org>
Fri, 11 Nov 2011 07:12:08 +0000 (08:12 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 11 Nov 2011 07:12:08 +0000 (08:12 +0100)

Trivial merge