From: root <root@blitz.inria.fr>
Date: Tue, 8 Mar 2011 22:33:15 +0000 (+0100)
Subject: Merge commit 'local_master/master'
X-Git-Tag: 5.0-rc21~69^2~1
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=9a52ad4578afe2fe7d1bcd190a7584241aa71206

Merge commit 'local_master/master'
---

9a52ad4578afe2fe7d1bcd190a7584241aa71206