From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 24 Apr 2012 16:51:51 +0000 (+0200)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~20
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=951442dd2320e49e39807476ffc248377886c00f

Merge branch 'upstreammaster'
---

951442dd2320e49e39807476ffc248377886c00f