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

Merge with head
---

dbee984e43f2b5e27b432c76007d42cc04a84324