From: root <root@blitz.inria.fr>
Date: Wed, 8 Dec 2010 15:40:26 +0000 (+0100)
Subject: Merge commit 'local_master/master'
X-Git-Tag: plcapi-5.0-25~8
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=33938bba0a1f90034390af839dfa4661c190acdc;hp=-c;p=plcapi.git

Merge commit 'local_master/master'
---

33938bba0a1f90034390af839dfa4661c190acdc