From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Thu, 21 Jul 2011 12:21:56 +0000 (+0200)
Subject: Merge with head
X-Git-Tag: nepi-3.0.0~355
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=742bd08c935b3f7f033badbd2c4712e760ec73e1;p=nepi.git

Merge with head
---

742bd08c935b3f7f033badbd2c4712e760ec73e1