Merge branch 'lxc_devel' of ssh://git.planet-lab.org/git/nodemanager into lxc_devel