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

Merge commit 'origin/master'
---

140300a38da236f8c88f2a85fd1699d300fa9024