From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Fri, 27 May 2011 13:47:57 +0000 (+0200)
Subject: Merging with head
X-Git-Tag: nepi_v2_1~53
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3ac0cad13d7cba5617ce7b3b2b3fc8a6e169081d;p=nepi.git

Merging with head
---

3ac0cad13d7cba5617ce7b3b2b3fc8a6e169081d