From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Thu, 6 Oct 2011 00:34:11 +0000 (+0200)
Subject: Merge with head
X-Git-Tag: nepi-3.0.0~171
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fc0dafbf66bddccfd99ad22f7cac06ffbd82e538;p=nepi.git

Merge with head
---

fc0dafbf66bddccfd99ad22f7cac06ffbd82e538