-build-SVNPATH := http://svn.planet-lab.org/svn/build/trunk
-ifeq "$(RELEASE)" "8"
-Linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/trunk
-else
-Linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/Linux-2.6/trunk
-endif
-libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/trunk
-util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/trunk
+# $Id$
+
+# build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
+
+# trying the trunk kernel
+#linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/branches/22
+linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/trunk
+madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/trunk
+util-vserver-SVNBRANCH := scholz
+util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/branches/scholz
+libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/trunk
+util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/trunk