From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Wed, 17 Aug 2011 16:09:25 +0000 (+0200)
Subject: merge -r 411
X-Git-Tag: nepi-3.0.0~286^2~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5fe61fe6d656d4f21b5e8811ef25f3a1613868d4;p=nepi.git

merge -r 411
---

5fe61fe6d656d4f21b5e8811ef25f3a1613868d4