From: root <root@blitz.inria.fr>
Date: Mon, 15 Nov 2010 22:50:02 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Tag: plcapi-5.0-19~58
X-Git-Url: http://git.onelab.eu/?p=plcapi.git;a=commitdiff_plain;h=9e29bc931570666bfc194df1aa631166f72f29d7

Merge commit 'origin/master'
---

9e29bc931570666bfc194df1aa631166f72f29d7