Merge branch 'master' into lxc

diff --combined planetlab-k32-tags.mk
index 5eeee50,ab92398..6d969b8
--- 1/planetlab-k32-tags.mk
--- 2/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@@ -18,7 -18,7 +18,7 @@@ libnl-GITPATH                 := git://git.planet-lab
  util-vserver-pl-GITPATH               := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-26
  nodeupdate-GITPATH            := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-9
  PingOfDeath-SVNPATH           := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 -nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-33
 +nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@lxcbuild
  # Trellis-specific NodeManager plugins
  nodemanager-topo-GITPATH      := git://git.planet-lab.org/NodeManager-topo@master
  NodeManager-optin-SVNPATH     := http://svn.planet-lab.org/svn/NodeManager-optin/trunk
@@@ -29,7 -29,7 +29,7 @@@ fprobe-ulog-SVNPATH             := http
  pf2slice-SVNPATH              := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
  Mom-SVNPATH                   := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-4
  inotify-tools-SVNPATH         := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
- openvswitch-GITPATH                   := git://git.planet-lab.org/openvswitch.git
+ openvswitch-GITPATH           := git://git.planet-lab.org/openvswitch.git@master
  vsys-GITPATH                  := git://git.planet-lab.org/vsys.git@vsys-0.99-2
  vsys-scripts-GITPATH          := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-33
  plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-36
@@@ -47,7 -47,7 +47,7 @@@ omf-GITPATH                     := git:
  sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-2.0-2
  sface-GITPATH                   := git://git.planet-lab.org/sface.git@master
  nodeconfig-GITPATH            := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-5
 -bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-20
 +bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@lxcbuild
  pypcilib-GITPATH              := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-10
  pyplnet-GITPATH                 := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-11
  DistributedRateLimiting-SVNPATH       := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1