Merge branch 'master' of ssh://git.zarb.org/srv/git/booh
authorGuillaume Cottenceau <gcottenc@gmail.com>
Tue, 5 Oct 2010 19:55:35 +0000 (21:55 +0200)
committerGuillaume Cottenceau <gcottenc@gmail.com>
Tue, 5 Oct 2010 19:55:35 +0000 (21:55 +0200)

Trivial merge