From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 12 Jun 2012 11:12:57 +0000 (+0200)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~18
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=6e46a2373bcda1c1793d18936cc40fb39beb149a

Merge branch 'upstreammaster'
---

6e46a2373bcda1c1793d18936cc40fb39beb149a