From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Thu, 20 Oct 2011 13:48:54 +0000 (+0200)
Subject: Merge branch 'master' into exp2
X-Git-Tag: sfa-2.1-24~3^2~326
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=db88e8be755e4a4c17fcd65eec98ca420eff91a4

Merge branch 'master' into exp2
---

db88e8be755e4a4c17fcd65eec98ca420eff91a4