From: root <root@blitz.inria.fr>
Date: Tue, 16 Nov 2010 21:44:00 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Tag: plcapi-5.0-19~56^2~8
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=57de50e9ae2f421500184955b10c9da5a7b53bab;p=plcapi.git

Merge commit 'origin/master'
---

57de50e9ae2f421500184955b10c9da5a7b53bab