Merge commit 'local_master/planetlab-3_2-branch' into planetlab-3_2-branch planetlab-3_3-bootcd-branch
authorroot <root@blitz.inria.fr>
Thu, 4 Nov 2010 05:25:27 +0000 (06:25 +0100)
committerroot <root@blitz.inria.fr>
Thu, 4 Nov 2010 05:25:27 +0000 (06:25 +0100)
commitf8db8a53732402f9f58b3e244f4eae8bd26085b7
tree246d72dc6e0d7c5841cd0f9de6f02154543a9850
parenta3ad7270dc6982e83fa947f4f8cf1bd7272fe15b
parent7dcd1f32b19b1e4e5d401f214896e1aa83a385f6
Merge commit 'local_master/planetlab-3_2-branch' into planetlab-3_2-branch