From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Thu, 18 Aug 2011 15:18:26 +0000 (+0200)
Subject: Merge with aly's
X-Git-Tag: nepi-3.0.0~286
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5d13a0f13040d5ad7ee8a298c4e734d9635bd264;p=nepi.git

Merge with aly's
---

5d13a0f13040d5ad7ee8a298c4e734d9635bd264