From: root <root@blitz.inria.fr>
Date: Fri, 1 Apr 2011 20:58:20 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Tag: nodemanager-2.0-32~6
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=cdc2396b04e5de401e75a57b27ed963a2f2663a4;p=nodemanager.git

Merge commit 'origin/master'
---

cdc2396b04e5de401e75a57b27ed963a2f2663a4