From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Wed, 22 Jun 2011 15:14:48 +0000 (+0200)
Subject: Merge with head
X-Git-Tag: nepi_v2_1~28
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5c13c5dacdb4213b865302f4ac104971ede43ed3;p=nepi.git

Merge with head
---

5c13c5dacdb4213b865302f4ac104971ede43ed3