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

Trivial merge