From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Wed, 25 May 2011 15:48:27 +0000 (+0200)
Subject: Merge with head
X-Git-Tag: nepi_v2~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=56be1dfd78b24aba3e475e3f09dda4e3eb861bd6;p=nepi.git

Merge with head
---

56be1dfd78b24aba3e475e3f09dda4e3eb861bd6