From: root <root@blitz.inria.fr>
Date: Mon, 28 Mar 2011 21:04:44 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Tag: sfa-1.0-21-ckp1~74^2~40^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5525a97f400f995d64eb23841a66e1f9ed2d53a3;p=sfa.git

Merge commit 'origin/master'
---

5525a97f400f995d64eb23841a66e1f9ed2d53a3