Merge commit 'local_master/planetlab-3_3-bootcd-branch' into planetlab-3_2-branch planetlab-3_2-branch
authorroot <root@cassidy.cs.princeton.edu>
Sun, 24 Oct 2010 20:12:42 +0000 (16:12 -0400)
committerroot <root@cassidy.cs.princeton.edu>
Sun, 24 Oct 2010 20:12:42 +0000 (16:12 -0400)
commit17312b0628d0dcf00214fd03d44d834a649c4f3d
treee2a64e931934893d9e56e5900e394e9ad2dae911
parenta5255e676664f883c11ed8d119203fa169e01685
parenta3ad7270dc6982e83fa947f4f8cf1bd7272fe15b
Merge commit 'local_master/planetlab-3_3-bootcd-branch' into planetlab-3_2-branch