# build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
-linux-2.6-BRANCH := coblitz2
-linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-22-49.3.coblitz
+linux-2.6-BRANCH := rhel6
+linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-5
madwifi-BRANCH := 0.9.4
madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.4-3
-util-vserver-BRANCH := scholz
-util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6
+util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-10
+util-vserver-BUILD-FROM-SRPM := yes # tmp
+util-vserver-pl-GITPATH := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-21
libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
-util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-27
NodeUpdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-7
PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
NodeManager-GITPATH := git://git.planet-lab.org/nodemanager@nodemanager-1.8-29
BootManager-GITPATH := git://git.planet-lab.org/bootmanager@bootmanager-4.3-19
pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9
BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-17
-VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-16
+VserverReference-GITPATH := git://git.planet-lab.org/vserver-reference@vserver-reference-5.0-5
BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-11
MyPLC-GITPATH := git://git.planet-lab.org/myplc@myplc-4.3-41
sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-14