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)

Trivial merge