Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sfa
authorsmbaker <smbaker@fc8clean.lan>
Thu, 29 Dec 2011 03:40:06 +0000 (19:40 -0800)
committersmbaker <smbaker@fc8clean.lan>
Thu, 29 Dec 2011 03:40:06 +0000 (19:40 -0800)

Trivial merge