Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/nodemanager
authorsmbaker <smbaker@fc8-storktest.lan>
Tue, 18 Jun 2013 22:07:59 +0000 (15:07 -0700)
committersmbaker <smbaker@fc8-storktest.lan>
Tue, 18 Jun 2013 22:07:59 +0000 (15:07 -0700)

Trivial merge