From: root <root@blitz.inria.fr>
Date: Thu, 24 Mar 2011 14:48:12 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Tag: 5.0-rc23~104
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6a06f4f5f0bf6f743bd2b79d43855f5d456240f9;p=build.git

Merge commit 'origin/master'
---

6a06f4f5f0bf6f743bd2b79d43855f5d456240f9