Merge branch '1.8' of ssh://git.planet-lab.org/git/nodemanager into 1.8
authorS.Çağlar Onur <caglar@cs.princeton.edu>
Thu, 20 Jan 2011 19:11:36 +0000 (14:11 -0500)
committerS.Çağlar Onur <caglar@cs.princeton.edu>
Thu, 20 Jan 2011 19:11:36 +0000 (14:11 -0500)

Trivial merge