Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sfa
authorsmbaker <smbaker@fc8clean.lan>
Tue, 8 Nov 2011 03:13:19 +0000 (19:13 -0800)
committersmbaker <smbaker@fc8clean.lan>
Tue, 8 Nov 2011 03:13:19 +0000 (19:13 -0800)

Trivial merge