Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sface
authorsmbaker <smbaker@fc8clean.lan>
Thu, 1 Dec 2011 21:14:11 +0000 (13:14 -0800)
committersmbaker <smbaker@fc8clean.lan>
Thu, 1 Dec 2011 21:14:11 +0000 (13:14 -0800)

Trivial merge