Merge branch 'master' of ssh://git.planet-lab.org/git/nodemanager
authorS.Çağlar Onur <caglar@cs.princeton.edu>
Mon, 11 Oct 2010 20:38:22 +0000 (16:38 -0400)
committerS.Çağlar Onur <caglar@cs.princeton.edu>
Mon, 11 Oct 2010 20:38:22 +0000 (16:38 -0400)

Trivial merge