From: root <root@blitz.inria.fr>
Date: Sat, 26 Mar 2011 16:06:13 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Tag: 5.0-rc23~100
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=89c3a2d56bd49c75c884b518e13bcab28d548d4f;p=build.git

Merge commit 'origin/master'
---

89c3a2d56bd49c75c884b518e13bcab28d548d4f