From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 13 Mar 2012 14:34:25 +0000 (-0700)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~21
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=c900832bcc4f4dddceeac1978d56e5f10e0e2bb5

Merge branch 'upstreammaster'
---

c900832bcc4f4dddceeac1978d56e5f10e0e2bb5