From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Sun, 25 Sep 2011 20:26:46 +0000 (+0200)
Subject: Merge with head
X-Git-Tag: nepi-3.0.0~219
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=37a77fc5e5b13cf5b0f6b2fe07e8587dc882c370;p=nepi.git

Merge with head
---

37a77fc5e5b13cf5b0f6b2fe07e8587dc882c370