Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sface
authorsmbaker <smbaker@fc8clean.lan>
Thu, 7 Jul 2011 17:49:24 +0000 (10:49 -0700)
committersmbaker <smbaker@fc8clean.lan>
Thu, 7 Jul 2011 17:49:24 +0000 (10:49 -0700)

Trivial merge