From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Mon, 18 Jul 2011 11:29:18 +0000 (+0200)
Subject: Merging with head
X-Git-Tag: nepi-3.0.0~374
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=277594b4d7688b6a0c98e77d05e2211f35db641d;p=nepi.git

Merging with head
---

277594b4d7688b6a0c98e77d05e2211f35db641d