Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sface