-build-SVNPATH := http://svn.planet-lab.org/svn/build/trunk
-# see planetlab.mk for when we use one or the other
-linux-tree-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/branches/2.6.20
-linux-patches-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/trunk
-#
-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
+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