Merge branch 'master' of ssh://git.planet-lab.org/git/plcapi
authorTony Mack <tmack@paris.CS.Princeton.EDU>
Wed, 1 Jun 2011 17:09:15 +0000 (13:09 -0400)
committerTony Mack <tmack@paris.CS.Princeton.EDU>
Wed, 1 Jun 2011 17:09:15 +0000 (13:09 -0400)

Trivial merge