From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 3 Nov 2011 14:28:50 +0000 (+0100)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~38
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=e39e728991b762ae0b52b52b06655f0c7f1b7421

Merge branch 'upstreammaster'
---

e39e728991b762ae0b52b52b06655f0c7f1b7421