Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sfa
authorsmbaker <smbaker@fc8clean.lan>
Tue, 29 Nov 2011 02:35:05 +0000 (18:35 -0800)
committersmbaker <smbaker@fc8clean.lan>
Tue, 29 Nov 2011 02:35:05 +0000 (18:35 -0800)

Trivial merge