Merge branch 'planetstack' of ssh://git.planet-lab.org/git/nodemanager into planetstack
authorAndy Bavier <acb@cs.princeton.edu>
Wed, 20 Nov 2013 20:58:29 +0000 (15:58 -0500)
committerAndy Bavier <acb@cs.princeton.edu>
Wed, 20 Nov 2013 20:58:29 +0000 (15:58 -0500)

Trivial merge