Merge branch '4.3' of ssh://git.planet-lab.org/git/bootmanager into 4.3