From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Mon, 4 Jul 2011 10:59:53 +0000 (+0200)
Subject: Merge with head
X-Git-Tag: nepi_v2_1~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b9d345f059551f1681a0b3597b33d58b11d8e12c;p=nepi.git

Merge with head
---

b9d345f059551f1681a0b3597b33d58b11d8e12c