Merge commit 'origin/master'

diff --git a/f12-tags.mk b/f12-tags.mk
index 96380f9..38cdf2d 100644 (file)
--- a/f12-tags.mk
+++ b/f12-tags.mk
@@ -1,6 +1,6 @@
 linux-2.6-BRANCH               := f12
 linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@linux-2.6.32-f12
 util-vserver-BRANCH            := f12
-util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/branches/f12@16162
+util-vserver-GITPATH           := http://git.onelab.eu/svn/util-vserver@f12
 yum-BRANCH                     := f12
-yum-SVNPATH                    := http://svn.planet-lab.org/svn/yum/branches/f12@16162
+yum-SVNPATH                    := http://svn.planet-lab.org/svn/yum/branches/f12

diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index 24652a9..4f77d3a 100755 (executable)
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 # -*-shell-*-
-# $Id$
 
 #shopt -s huponexit