From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Tue, 27 Sep 2011 02:03:18 +0000 (+0200)
Subject: Merge with head
X-Git-Tag: nepi-3.0.0~212
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d9d48c3f87d8a573d0af27c27004c861af9a1bb3;p=nepi.git

Merge with head
---

d9d48c3f87d8a573d0af27c27004c861af9a1bb3