Merge branch 'master' of ssh://git.planet-lab.org/git/plewww
authorroot <root@pl-service-04.cs.princeton.edu>
Wed, 13 Oct 2010 23:42:59 +0000 (19:42 -0400)
committerroot <root@pl-service-04.cs.princeton.edu>
Wed, 13 Oct 2010 23:42:59 +0000 (19:42 -0400)

Trivial merge