Merge branch 'master' of ssh://git.onelab.eu/git/bootstrapfs
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 9 May 2011 08:04:07 +0000 (10:04 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 9 May 2011 08:04:07 +0000 (10:04 +0200)

Trivial merge