Merge branch 'master' of ssh://zarb.org/srv/git/booh
authorGuillaume Cottenceau <gcottenc@gmail.com>
Fri, 3 Sep 2010 07:24:39 +0000 (09:24 +0200)
committerGuillaume Cottenceau <gcottenc@gmail.com>
Fri, 3 Sep 2010 07:24:39 +0000 (09:24 +0200)

Trivial merge