From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Thu, 9 Jun 2011 13:06:22 +0000 (+0200)
Subject: Merging with HEAD
X-Git-Tag: nepi_v2_1~32^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2ee94331006a952e8e021a5c4f85f4e9316e9928;p=nepi.git

Merging with HEAD
---

2ee94331006a952e8e021a5c4f85f4e9316e9928