Merge branch 'master' of ssh://git.planet-lab.org/git/pyplnet
authorMarco Yuen <marcoy@gmail.com>
Sun, 25 Sep 2011 01:05:41 +0000 (21:05 -0400)
committerMarco Yuen <marcoy@gmail.com>
Sun, 25 Sep 2011 01:05:41 +0000 (21:05 -0400)

Trivial merge