Merge branch '1.8' of ssh://git.planet-lab.org/git/nodemanager into 1.8
authorS.Çağlar Onur <caglar@verivue.com>
Fri, 18 Mar 2011 19:55:59 +0000 (15:55 -0400)
committerS.Çağlar Onur <caglar@verivue.com>
Fri, 18 Mar 2011 19:55:59 +0000 (15:55 -0400)

Trivial merge