From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Wed, 6 Jul 2011 15:22:54 +0000 (+0200)
Subject: Merge with head
X-Git-Tag: nepi-3.0.0~381
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bf3408af80db30702aa06b981d7928b40ebae092;p=nepi.git

Merge with head
---

bf3408af80db30702aa06b981d7928b40ebae092