From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Sun, 2 Oct 2011 19:10:58 +0000 (+0200)
Subject: Merge with head
X-Git-Tag: nepi-3.0.0~179
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8a6bc695cec6ee8b8aa0199ddefb036eb382c444;p=nepi.git

Merge with head
---

8a6bc695cec6ee8b8aa0199ddefb036eb382c444