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

Merge commit 'origin/master'
---

a0204f0501a02f6a25c07093fb0f16fefbdccdd2