From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Tue, 24 May 2011 08:26:42 +0000 (+0200)
Subject: Merge with head
X-Git-Tag: nepi_v2~6
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0e7419b557b9232de211aec64d43092ddc69c0cb;p=nepi.git

Merge with head
---

0e7419b557b9232de211aec64d43092ddc69c0cb