From: root <root@blitz.inria.fr>
Date: Tue, 5 Apr 2011 15:12:14 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Tag: 5.0-rc23~96
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=61812161f69f838e02b23543feb354f7233c0259;p=build.git

Merge commit 'origin/master'
---

61812161f69f838e02b23543feb354f7233c0259