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/?p=nodeupdate.git;a=commitdiff_plain;h=refs%2Fheads%2Fplanetlab-3_3-bootcd-branch

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

f8db8a53732402f9f58b3e244f4eae8bd26085b7