From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Fri, 30 Sep 2011 06:26:47 +0000 (+0200)
Subject: Merge with head
X-Git-Tag: nepi-3.0.0~202
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3140fcbabe589031198ef0955d06ee1edfdfe93e;p=nepi.git

Merge with head
---

3140fcbabe589031198ef0955d06ee1edfdfe93e