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

Merge commit 'origin/master'
---

cfeb502877d73623a039217f77627f3eb91f273c