Merge branch 'master' of ssh://git.onelab.eu/git/build

diff --combined lxc-tags.mk
index 2385123,0bfbb29..68dd7c6
--- 1/lxc-tags.mk
--- 2/lxc-tags.mk
+++ b/lxc-tags.mk
@@@ -18,7 -18,7 +18,7 @@@ pf2slice-SVNPATH              := http://svn.planet-
  mom-GITPATH                     := git://git.planet-lab.org/mom.git@mom-2.3-5
  inotify-tools-GITPATH         := git://git.planet-lab.org/inotify-tools.git@inotify-tools-3.13-2
  openvswitch-GITPATH           := git://git.planet-lab.org/openvswitch.git@openvswitch-1.2-1
- vsys-GITPATH                  := git://git.planet-lab.org/vsys.git@vsys-0.99-2
+ vsys-GITPATH                  := git://git.planet-lab.org/vsys.git@vsys-0.99-3
  vsys-scripts-GITPATH          := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-45
  bind_public-GITPATH             := git://git.planet-lab.org/bind_public.git@bind_public-0.1-2
  plcapi-GITPATH                  := git://git.planet-lab.org/plcapi.git@master
@@@ -37,7 -37,7 +37,7 @@@ sface-GITPATH                   := git:
  nodeconfig-GITPATH            := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-7
  # this module still has changes that won't run on the mainstream distrib
  bootmanager-BRANCH            := lxc_devel
 -bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.1-5
 +bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@lxc_devel
  pypcilib-GITPATH                := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-11
  pyplnet-GITPATH                 := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-16
  DistributedRateLimiting-SVNPATH       := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1

diff --combined onelab-tags.mk
index 8de9ba6,fbf36cd..c029de1
--- 1/onelab-tags.mk
--- 2/onelab-tags.mk
+++ b/onelab-tags.mk
@@@ -29,7 -29,7 +29,7 @@@ fprobe-ulog-GITPATH             := git:
  pf2slice-SVNPATH              := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
  mom-GITPATH                     := git://git.onelab.eu/mom.git@mom-2.3-5
  inotify-tools-SVNPATH         := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
- vsys-GITPATH                    := git://git.onelab.eu/vsys.git@vsys-0.99-2
+ vsys-GITPATH                    := git://git.onelab.eu/vsys.git@vsys-0.99-3
  vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-45
  autoconf-GITPATH              := git://git.onelab.eu/autoconf@autoconf-2.69-1
  sliver-openvswitch-GITPATH      := git://git.onelab.eu/sliver-openvswitch.git@sliver-openvswitch-1.9.90-3
@@@ -49,7 -49,7 +49,7 @@@ oml-GITPATH                     := git:
  sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-2.1-25
  sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.9-9
  nodeconfig-GITPATH              := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-7
 -bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-24
 +bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@master
  pypcilib-GITPATH                := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-11
  pyplnet-GITPATH                 := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-16
  bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.1-5