From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Tue, 4 Oct 2011 07:30:12 +0000 (+0200)
Subject: Merge with head
X-Git-Tag: nepi-3.0.0~173
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a8a1bac1a198493cced1a0773eaffde6c361363c;p=nepi.git

Merge with head
---

a8a1bac1a198493cced1a0773eaffde6c361363c