Merge commit 'origin/master'

diff --combined onelab-k27-tags.mk
index 1743ec3,59200b3..ac95954
--- 1/onelab-k27-tags.mk
--- 2/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@@ -1,7 -1,7 +1,7 @@@
  # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
  
  ###
- linux-2.6-GITPATH             := git://git.onelab.eu/linux-2.6.git@linux-2.6-27-34
+ linux-2.6-GITPATH             := git://git.onelab.eu/linux-2.6.git@linux-2.6-27-35
  madwifi-GITPATH                 := git://git.onelab.eu/madwifi.git@madwifi-4132-2
  iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.10-4
  iptables-BUILD-FROM-SRPM        := yes        # tmp
@@@ -32,7 -32,7 +32,7 @@@ vsys-GITPATH                  := git://git.onelab.eu/v
  vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-28
  plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-32
  drupal-SVNPATH                        := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
 -plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-62
 +plewww-GITPATH                  := git://git.onelab.eu/plewww.git@master
  www-register-wizard-SVNPATH     := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
  pcucontrol-GITPATH              := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-10
  Monitor-SVNPATH                       := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
@@@ -44,7 -44,7 +44,7 @@@ ejabberd-GITPATH              := git://git.onelab.e
  omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-10
  oml-GITPATH                     := git://git.onelab.eu/oml.git@oml-2.5.1-1
  ###
 -sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-1.0-21
 +sfa-GITPATH                     := git://git.onelab.eu/sfa.git@master
  sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.1-9
  nodeconfig-GITPATH              := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5
  bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-17
@@@ -57,7 -57,7 +57,7 @@@ myplc-GITPATH                   := git:
  DistributedRateLimiting-SVNPATH       := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
  
  # locating the right test directory - see make tests_gitpath
 -tests-GITPATH                   := git://git.onelab.eu/tests.git@tests-5.0-26
 +tests-GITPATH                   := git://git.onelab.eu/tests.git@master
  
  ### temporary
  # nozomi not needed anymore for 2.6.27

diff --combined planetlab-k27-tags.mk
index 97ffa83,b26024f..9a5d8b3
--- 1/planetlab-k27-tags.mk
--- 2/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@@ -1,6 -1,6 +1,6 @@@
  # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
  
- linux-2.6-GITPATH             := git://git.planet-lab.org/linux-2.6.git@linux-2.6-27-34
+ linux-2.6-GITPATH             := git://git.planet-lab.org/linux-2.6.git@linux-2.6-27-35
  madwifi-GITPATH                       := git://git.planet-lab.org/madwifi.git@madwifi-4132-2
  iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.10-4
  iptables-BUILD-FROM-SRPM := yes       # tmp
@@@ -28,7 -28,7 +28,7 @@@ vsys-GITPATH                  := git://git.planet-lab.
  vsys-scripts-GITPATH          := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-28
  plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-32
  drupal-SVNPATH                        := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
 -plewww-GITPATH                        := git://git.planet-lab.org/plewww@plewww-4.3-62
 +plewww-GITPATH                        := git://git.planet-lab.org/plewww@plewww-4.3-63
  www-register-wizard-SVNPATH   := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
  Monitor-SVNPATH                       := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
  PLCRT-SVNPATH                 := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11