Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
authorAndy Bavier <acb@cs.princeton.edu>
Mon, 7 Mar 2011 22:04:20 +0000 (17:04 -0500)
committerAndy Bavier <acb@cs.princeton.edu>
Mon, 7 Mar 2011 22:04:20 +0000 (17:04 -0500)

Trivial merge