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

Merge commit 'origin/master'
---

0803b46c4d204e5f0783026a201c09d4103118ef