-plnode-utils-GITPATH := git://git.planet-lab.org/plnode-utils@plnode-utils-0.2-1
-nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.1-21
-# Trellis-specific NodeManager plugins
-nodemanager-topo-GITPATH := git://git.planet-lab.org/NodeManager-topo@master
-NodeManager-optin-SVNPATH := http://svn.planet-lab.org/svn/NodeManager-optin/trunk
+plnode-utils-GITPATH := git://git.planet-lab.org/plnode-utils.git@plnode-utils-0.2-2
+nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.1-22