Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sface
authorsmbaker <smbaker@fc8clean.lan>
Mon, 19 Sep 2011 17:38:21 +0000 (10:38 -0700)
committersmbaker <smbaker@fc8clean.lan>
Mon, 19 Sep 2011 17:38:21 +0000 (10:38 -0700)

Trivial merge