From: root <root@blitz.inria.fr>
Date: Fri, 1 Apr 2011 21:18:14 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Tag: 5.0-rc23~97
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=41c04b2453c315b8046283e7a0e18b712812c732;p=build.git

Merge commit 'origin/master'
---

41c04b2453c315b8046283e7a0e18b712812c732