From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Wed, 28 Sep 2011 12:05:32 +0000 (+0200)
Subject: Merge with head
X-Git-Tag: nepi-3.0.0~208
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f9c42e979004e011b71856291d5f566393e27a09;p=nepi.git

Merge with head
---

f9c42e979004e011b71856291d5f566393e27a09