From: root <root@blitz.inria.fr>
Date: Tue, 18 Jan 2011 21:51:16 +0000 (+0100)
Subject: Merge commit 'local_master/master'
X-Git-Tag: 5.0-rc18~88
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d78ee34f11069e60817b3833cf683c4502f722bd;p=build.git

Merge commit 'local_master/master'
---

d78ee34f11069e60817b3833cf683c4502f722bd