Merge branch 'master' into lxc_devel

diff --combined onelab-k32-tags.mk
index 81dc8b7,6ff7264..75f8472
--- 1/onelab-k32-tags.mk
--- 2/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@@ -49,10 -49,10 +49,10 @@@ ejabberd-GITPATH                := git:
  omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-11
  oml-GITPATH                     := git://git.onelab.eu/oml.git@oml-2.6.1-1
  ###
- sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-2.0-6
- sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.9-0
+ sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-2.0-9
+ sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.9-3
  nodeconfig-GITPATH              := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5
 -bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-20
 +bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@lxcbuild
  pypcilib-GITPATH              := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-10
  pyplnet-GITPATH                 := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-11
  bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.0-11

diff --combined planetlab-k32-tags.mk
index 747c1e1,dea9552..957e5de
--- 1/planetlab-k32-tags.mk
--- 2/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@@ -3,10 -3,9 +3,10 @@@
  mkinitrd-GITPATH              := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-2
  linux-2.6-BRANCH              := rhel6
  linux-2.6-GITPATH             := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-27
 +linux-3-GITPATH               := git://git.planet-lab.org/linux-3.git@lxcbuild
  # help out spec2make on f8 and centos5, due to a bug in rpm
  ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
 -kernel-WHITELIST-RPMS := kernel-devel,kernel-headers
 +kernel-WHITELIST-RPMS := kernel-devel,kernel-headers,kernel-firmware
  endif
  kernel-DEVEL-RPMS             += elfutils-libelf-devel
  madwifi-GITPATH                 := git://git.planet-lab.org/madwifi.git@madwifi-4132-4
@@@ -19,7 -18,7 +19,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-34
 +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
@@@ -45,10 -44,10 +45,10 @@@ pyaspects-GITPATH          := git://git.planet-
  ejabberd-GITPATH              := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.6-2
  omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-11
  ###
- sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-2.0-6
- sface-GITPATH                   := git://git.planet-lab.org/sface.git@sface-0.9-0
+ sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-2.0-7
+ sface-GITPATH                   := git://git.planet-lab.org/sface.git@sface-0.9-3
  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
@@@ -58,6 -57,4 +58,6 @@@ vserver-reference-GITPATH       := git:
  bootstrapfs-GITPATH             := git://git.planet-lab.org/bootstrapfs.git@bootstrapfs-2.0-13
  myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@myplc-5.0-19
  # locating the right test directory - see make tests_gitpath
 -tests-GITPATH                   := git://git.planet-lab.org/tests.git@tests-5.0-34
 +tests-GITPATH                   := git://git.planet-lab.org/tests.git@tests-5.0-32
 +libvirt-GITPATH                 := git://git.planet-lab.org/libvirt.git@lxcbuild
 +lxc-reference-GITPATH           := git://git.planet-lab.org/lxc-reference.git@lxcbuild