From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Sat, 1 Oct 2011 18:26:31 +0000 (+0200)
Subject: Merge with head
X-Git-Tag: nepi-3.0.0~191
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ebf1d345f968a170014f27e37038d9e6b6fea014;p=nepi.git

Merge with head
---

ebf1d345f968a170014f27e37038d9e6b6fea014