From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Fri, 26 Aug 2011 15:58:33 +0000 (+0200)
Subject: Merge with head
X-Git-Tag: nepi-3.0.0~260
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=158ef6a512a64c25c66e2c5761ae0bde88a83608;p=nepi.git

Merge with head
---

158ef6a512a64c25c66e2c5761ae0bde88a83608