From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 16 Nov 2011 13:44:14 +0000 (+0100)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~34
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=69fb221c274eb0b6e9f6ff6f895e5e6f90b17230

Merge branch 'upstreammaster'
---

69fb221c274eb0b6e9f6ff6f895e5e6f90b17230