Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sfa
authorsmbaker <smbaker@fc8clean.lan>
Tue, 27 Sep 2011 02:59:23 +0000 (19:59 -0700)
committersmbaker <smbaker@fc8clean.lan>
Tue, 27 Sep 2011 02:59:23 +0000 (19:59 -0700)

Trivial merge