From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 19 Jun 2012 21:05:56 +0000 (+0200)
Subject: merged master into lxc_devel
X-Git-Tag: nodemanager-2.1-2~9
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=6ec82e6a49df218bcbf4337d85d8d87dc8273824

merged master into lxc_devel
---

6ec82e6a49df218bcbf4337d85d8d87dc8273824