Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sfa
authorsmbaker <smbaker@fc8clean.lan>
Thu, 4 Aug 2011 23:13:27 +0000 (16:13 -0700)
committersmbaker <smbaker@fc8clean.lan>
Thu, 4 Aug 2011 23:13:27 +0000 (16:13 -0700)

Trivial merge