Merge branch 'master' of ssh://git.zarb.org/srv/git/booh
authorGuillaume Cottenceau <gcottenc@gmail.com>
Sat, 14 Feb 2009 13:51:12 +0000 (14:51 +0100)
committerGuillaume Cottenceau <gcottenc@gmail.com>
Sat, 14 Feb 2009 13:51:12 +0000 (14:51 +0100)

Trivial merge