From: root <root@blitz.inria.fr>
Date: Fri, 20 Aug 2010 13:09:28 +0000 (+0200)
Subject: Merge commit 'local_master/master'
X-Git-Tag: bootstrapfs-2.0-7~4
X-Git-Url: http://git.onelab.eu/?p=bootstrapfs.git;a=commitdiff_plain;h=bf875be66195318943b34cd86845f9d83c0bdeb4

Merge commit 'local_master/master'
---

bf875be66195318943b34cd86845f9d83c0bdeb4