From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Thu, 20 Jan 2011 23:17:59 +0000 (-0500)
Subject: Merge branch '1.8' of ssh://git.planet-lab.org/git/nodemanager into 1.8
X-Git-Tag: nodemanager-1.8-34~1
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=93e6938856540ba2f4ed050a7631281aa2b63f3f

Merge branch '1.8' of ssh://git.planet-lab.org/git/nodemanager into 1.8
---

93e6938856540ba2f4ed050a7631281aa2b63f3f