From: root <root@blitz.inria.fr>
Date: Thu, 4 Nov 2010 05:25:27 +0000 (+0100)
Subject: Merge commit 'local_master/planetlab-3_2-branch' into planetlab-3_2-branch
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=refs%2Fheads%2Fplanetlab-3_3-bootcd-branch;hp=a3ad7270dc6982e83fa947f4f8cf1bd7272fe15b;p=nodeupdate.git

Merge commit 'local_master/planetlab-3_2-branch' into planetlab-3_2-branch
---