Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
authorTony Mack <tmack@paris.CS.Princeton.EDU>
Tue, 28 Sep 2010 20:58:30 +0000 (16:58 -0400)
committerTony Mack <tmack@paris.CS.Princeton.EDU>
Tue, 28 Sep 2010 20:58:30 +0000 (16:58 -0400)

Trivial merge