From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Sun, 4 Sep 2011 17:31:46 +0000 (+0200)
Subject: Merge with HEAD, close aly's branch.
X-Git-Tag: nepi-3.0.0~251
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=221dc7a823e3310b5ef1cc8f23d49ec1e65b687e;p=nepi.git

Merge with HEAD, close aly's branch.
---

221dc7a823e3310b5ef1cc8f23d49ec1e65b687e