Merge branch 'master' of ssh://git.planet-lab.org/git/pyplnet
authorAndy Bavier <acb@cs.princeton.edu>
Fri, 9 Aug 2013 13:42:42 +0000 (09:42 -0400)
committerAndy Bavier <acb@cs.princeton.edu>
Fri, 9 Aug 2013 13:42:42 +0000 (09:42 -0400)

Trivial merge