From: root <root@blitz.inria.fr>
Date: Thu, 2 Sep 2010 14:23:02 +0000 (+0200)
Subject: Merge commit 'local_master/master'
X-Git-Tag: plcapi-5.0-17~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d605bcab2509fc2f9c6c5f1fae740d0e8c061a62;p=plcapi.git

Merge commit 'local_master/master'
---

d605bcab2509fc2f9c6c5f1fae740d0e8c061a62