Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
authorAndy Bavier <acb@cs.princeton.edu>
Thu, 29 Sep 2011 21:30:41 +0000 (17:30 -0400)
committerAndy Bavier <acb@cs.princeton.edu>
Thu, 29 Sep 2011 21:30:41 +0000 (17:30 -0400)

Trivial merge