Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sfa
authorsmbaker <smbaker@fc8clean.lan>
Mon, 21 Nov 2011 22:03:20 +0000 (14:03 -0800)
committersmbaker <smbaker@fc8clean.lan>
Mon, 21 Nov 2011 22:03:20 +0000 (14:03 -0800)

Trivial merge