Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
authorAndy Bavier <acb@acb-imac.cs.princeton.edu>
Wed, 23 Feb 2011 22:01:06 +0000 (17:01 -0500)
committerAndy Bavier <acb@acb-imac.cs.princeton.edu>
Wed, 23 Feb 2011 22:01:06 +0000 (17:01 -0500)

Trivial merge