Merge branch 'master' of ssh://git.onelab.eu/git/build

diff --combined onelab-tags.mk
index 93b5ab3,e7cffaa..9be4d9e
--- 1/onelab-tags.mk
--- 2/onelab-tags.mk
+++ b/onelab-tags.mk
@@@ -21,7 -21,7 +21,7 @@@ util-vserver-pl-BRANCH                := 0.
  util-vserver-pl-GITPATH               := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.3-32
  nodeupdate-GITPATH            := git://git.onelab.eu/nodeupdate.git@NodeUpdate-0.5-6
  PingOfDeath-SVNPATH           := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
- nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-21
+ nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@master
  pl_sshd-SVNPATH                       := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
  codemux-GITPATH                       := git://git.onelab.eu/codemux.git@CoDemux-0.1-14
  fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
@@@ -53,7 -53,7 +53,7 @@@ pyplnet-GITPATH                       := git://git.onelab.e
  bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.0-5
  vserver-reference-GITPATH        := git://git.onelab.eu/vserver-reference.git@VserverReference-5.0-3
  bootstrapfs-GITPATH             := git://git.onelab.eu/bootstrapfs.git@BootstrapFS-2.0-6
 -myplc-GITPATH                   := git://git.onelab.eu/myplc.git@myplc-5.0-11
 +myplc-GITPATH                   := git://git.onelab.eu/myplc.git@master
  DistributedRateLimiting-SVNPATH       := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
  
  # locating the right test directory - see make tests_gitpath