From: Nicolas Turro <Nicolas.Turro@inria.fr>
Date: Fri, 25 Nov 2011 09:43:36 +0000 (+0100)
Subject: Merge branch 'master' into senslab2
X-Git-Tag: sfa-2.1-24~3^2~269
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=bb57cb30c7cfdddcf8e55fd7084e3cdaf67eaac4

Merge branch 'master' into senslab2
---

bb57cb30c7cfdddcf8e55fd7084e3cdaf67eaac4