Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sfa
authorsmbaker <smbaker@fc8clean.lan>
Tue, 30 Aug 2011 16:43:05 +0000 (09:43 -0700)
committersmbaker <smbaker@fc8clean.lan>
Tue, 30 Aug 2011 16:43:05 +0000 (09:43 -0700)

Trivial merge