From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Wed, 17 Aug 2011 17:45:39 +0000 (+0200)
Subject: Merge with head
X-Git-Tag: nepi-3.0.0~294
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3ba1f449fc792f93efcb69b534898987e220ddbd;p=nepi.git

Merge with head
---

3ba1f449fc792f93efcb69b534898987e220ddbd