From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 16 Jan 2012 14:21:17 +0000 (+0100)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~24
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=f7f57707d12dd626d4293dc1e34451fc23763052

Merge branch 'upstreammaster'
---

f7f57707d12dd626d4293dc1e34451fc23763052