From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 31 Oct 2011 18:31:42 +0000 (+0100)
Subject: solve merge conflict
X-Git-Tag: sfa-1.1-2~17
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=f11dae03d2dc79be445c9a604c9c7fc4b222d98d

solve merge conflict
---

f11dae03d2dc79be445c9a604c9c7fc4b222d98d