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

Merge commit 'origin/master'
---

61eddcee6bc0e5e7c623d23688bd538e2a452b12