Merge branch 'master' of ssh://git.planet-lab.org/git/pyplnet
authorAndrew Bavier <acb@aether.cs.princeton.edu>
Fri, 27 Apr 2012 15:45:02 +0000 (11:45 -0400)
committerAndrew Bavier <acb@aether.cs.princeton.edu>
Fri, 27 Apr 2012 15:45:02 +0000 (11:45 -0400)

Trivial merge