Merge branch 'master' of ssh://git.onelab.eu/git/bootstrapfs
Thierry Parmentelat [Sat, 5 Feb 2011 23:20:03 +0000 (00:20 +0100)]

Trivial merge