From: root <root@blitz.inria.fr>
Date: Wed, 30 Mar 2011 17:45:18 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Tag: 5.0-rc23~98
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1bc9e626e0167823351f3255a57f5be79367dc06;p=build.git

Merge commit 'origin/master'
---

1bc9e626e0167823351f3255a57f5be79367dc06