Merge branch 'master' of ssh://zarb.org/srv/git/booh
authorGuillaume Cottenceau <gcottenc@gmail.com>
Tue, 8 Feb 2011 16:58:21 +0000 (17:58 +0100)
committerGuillaume Cottenceau <gcottenc@gmail.com>
Tue, 8 Feb 2011 16:58:21 +0000 (17:58 +0100)

Trivial merge