Merge branch 'master' of ssh://git.planet-lab.org/git/build

diff --combined planetlab-k27-tags.mk
index d5a26bb,b654eb2..bd776d4
--- 1/planetlab-k27-tags.mk
--- 2/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@@ -26,7 -26,7 +26,7 @@@ inotify-tools-SVNPATH         := http://svn.pl
  vsys-BRANCH                   := 0.9
  vsys-GITPATH                  := git://git.planet-lab.org/vsys.git@vsys-0.9-5
  vsys-scripts-GITPATH          := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-20
- plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-16
+ plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-18
  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-50
  www-register-wizard-SVNPATH   := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
@@@ -38,7 -38,7 +38,7 @@@ pyaspects-GITPATH             := git://git.planet-
  ejabberd-GITPATH              := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-1
  omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-8
  ###
 -sfa-SVNPATH                   := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-16
 +sfa-SVNPATH                   := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-17
  nodeconfig-SVNPATH            := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-3
  pypcilib-GITPATH              := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9
  pyplnet-GITPATH                       := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-6

diff --combined planetlab-k32-tags.mk
index 5a3c975,4b41669..b5e1fc1
--- 1/planetlab-k32-tags.mk
--- 2/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@@ -25,7 -25,7 +25,7 @@@ inotify-tools-SVNPATH         := http://svn.pl
  vsys-BRANCH                   := 0.9
  vsys-GITPATH                  := git://git.planet-lab.org/vsys.git@vsys-0.9-5
  vsys-scripts-GITPATH          := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-20
- plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-16
+ plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-18
  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-50
  www-register-wizard-SVNPATH   := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
@@@ -38,7 -38,7 +38,7 @@@ pyaspects-GITPATH             := git://git.planet-
  ejabberd-GITPATH              := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-1
  omf-GITPATH                     := git://git.planet-lab.org/omf.git@omf-5.3-8
  ###
 -sfa-SVNPATH                   := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-16
 +sfa-SVNPATH                   := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-17
  nodeconfig-SVNPATH            := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-3
  bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-12
  pypcilib-GITPATH              := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9