From: root <root@blitz.inria.fr>
Date: Sat, 26 Mar 2011 13:55:30 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Tag: sfa-1.0-21-ckp1~74^2~44^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=cccd9d9a58421493631320ee2251e8de3d3f2109;p=sfa.git

Merge commit 'origin/master'
---

cccd9d9a58421493631320ee2251e8de3d3f2109