From: root <root@blitz.inria.fr>
Date: Thu, 9 Dec 2010 17:24:16 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Tag: 5.0-rc17~6
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e8ef894f0a0eb769eb27abe0d7a77484cc6d6d2f;p=build.git

Merge commit 'origin/master'
---

e8ef894f0a0eb769eb27abe0d7a77484cc6d6d2f