From: root <root@blitz.inria.fr>
Date: Wed, 23 Mar 2011 14:48:13 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Tag: 5.0-rc23~105^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c797cfab12863c73de5619c38dcfee91fe1016c4;p=build.git

Merge commit 'origin/master'
---

c797cfab12863c73de5619c38dcfee91fe1016c4