Merge commit 'origin/master'

diff --combined onelab-tags.mk
index ae49c8d,2b8ba80..137d798
--- 1/onelab-tags.mk
--- 2/onelab-tags.mk
+++ b/onelab-tags.mk
@@@ -14,7 -14,7 +14,7 @@@ comgt-SVNPATH                 := http://svn.onelab.eu
  planetlab-umts-tools-GITPATH  := git://git.onelab.eu/planetlab-umts-tools@planetlab-umts-tools-0.6-5
  ###
  util-vserver-BUILD-FROM-SRPM := yes # tmp
 -util-vserver-GITPATH          := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-8
 +util-vserver-GITPATH          := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-9
  libnl-SVNPATH                 := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
  # 2.6.22 kernels need 0.3 branch and 2.6.27 need 0.4 (trunk).
  util-vserver-pl-BRANCH                := 0.3
@@@ -31,7 -31,7 +31,7 @@@ inotify-tools-SVNPATH         := http://svn.pl
  vsys-BRANCH                   := 0.9
  vsys-GITPATH                  := git://git.onelab.eu/vsys.git@vsys-0.9-5
  vsys-scripts-GITPATH          := git://git.onelab.eu/vsys-scripts@vsys-scripts-0.95-25
- plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-19
+ plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@master
  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-55
  www-register-wizard-SVNPATH     := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5