From: root <root@cassidy.cs.princeton.edu>
Date: Sun, 24 Oct 2010 20:12:42 +0000 (-0400)
Subject: Merge commit 'local_master/planetlab-3_3-bootcd-branch' into planetlab-3_2-branch
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=refs%2Fheads%2Fplanetlab-3_2-branch;p=nodeupdate.git

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

17312b0628d0dcf00214fd03d44d834a649c4f3d