From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 28 Feb 2012 18:58:57 +0000 (+0100)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~23
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=04255538dbacfa52a45e8439b9c9ea590a82dc47

Merge branch 'upstreammaster'
---

04255538dbacfa52a45e8439b9c9ea590a82dc47