fix Conflicts:
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 1 Apr 2012 13:16:22 +0000 (15:16 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 1 Apr 2012 13:16:22 +0000 (15:16 +0200)
commit3d7c1e1b0e1aeb7b631883af2ea549443ade8e2e
treeb6f436fd04512b61d8dbbcda634372b0bce258b6
parent714503fed307a5a8fff3eed75b99d6025d73a334
parent48fb84afa4ae1f6a7faeb3a22355f9bcfcb510cf
fix Conflicts:
vbuild-init-lxc.sh
vbuild-init-lxc.sh