Merge branch 'master' of ssh://git.onelab.eu/git/bootstrapfs
Thierry Parmentelat [Fri, 10 Jun 2011 12:21:24 +0000 (14:21 +0200)]

Trivial merge