svn merge -c 9766 https://svn.planet-lab.org/svn/BootManager/branches/3.2 into trunk