From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Tue, 9 Aug 2011 15:44:14 +0000 (+0200)
Subject: Merge with head
X-Git-Tag: nepi-3.0.0~314
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e1cea30060f499111e893b290557faa42908cf78;p=nepi.git

Merge with head
---

e1cea30060f499111e893b290557faa42908cf78