From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Wed, 27 Jul 2011 14:01:38 +0000 (+0200)
Subject: Merge with head
X-Git-Tag: nepi-3.0.0~341
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=48c75c29e83c047d9d5a2ab9d911a449c78fc70b;p=nepi.git

Merge with head
---

48c75c29e83c047d9d5a2ab9d911a449c78fc70b