From: root <root@blitz.inria.fr>
Date: Fri, 18 Feb 2011 20:03:12 +0000 (+0100)
Subject: Merge commit 'local_master/master'
X-Git-Tag: 5.0-rc21~87^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7efd631e3ce2d1c916ee338948ddf103131d539a;p=build.git

Merge commit 'local_master/master'
---

7efd631e3ce2d1c916ee338948ddf103131d539a