Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sface
authorsmbaker <smbaker@fc8clean.lan>
Thu, 12 Jan 2012 20:27:00 +0000 (12:27 -0800)
committersmbaker <smbaker@fc8clean.lan>
Thu, 12 Jan 2012 20:27:00 +0000 (12:27 -0800)

Trivial merge