Merge branch 'planetlab/master'

Conflicts:
	coblitz-latest-tags.mk

diff --cc coblitz-latest-tags.mk
index 51e7c7c,74aa25a..5246b65
--- 1/coblitz-latest-tags.mk
--- 2/coblitz-latest-tags.mk
+++ b/coblitz-latest-tags.mk
@@@ -1,15 -1,15 +1,15 @@@
  # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
  
 -mkinitrd-GITPATH              := git://git.verivue.com/planetlab/mkinitrd.git@mkinitrd-5.1.19.6-3
 +mkinitrd-GITPATH              := git://git.verivue.com/planetlab/mkinitrd.git@mkinitrd-5.1.19.6-4
  linux-2.6-BRANCH                := rhel6
  linux-2.6-GITPATH               := git://git.verivue.com/planetlab/linux-2.6.git@linux-2.6-32-16
- util-vserver-GITPATH            := git://git.verivue.com/planetlab/util-vserver.git@util-vserver-0.30.216-16
+ util-vserver-GITPATH            := git://git.verivue.com/planetlab/util-vserver.git@util-vserver-0.30.216-17
  util-vserver-BUILD-FROM-SRPM  := yes     # tmp
- util-vserver-pl-GITPATH         := git://git.verivue.com/planetlab/util-vserver-pl.git@util-vserver-pl-0.4-25
+ util-vserver-pl-GITPATH         := git://git.verivue.com/planetlab/util-vserver-pl.git@util-vserver-pl-0.4-26
  libnl-GITPATH                 := git://git.verivue.com/planetlab/libnl.git@libnl-1.1-2
- nodeupdate-GITPATH            := git://git.verivue.com/planetlab/nodeupdate.git@nodeupdate-0.5-8
+ nodeupdate-GITPATH            := git://git.verivue.com/planetlab/nodeupdate.git@nodeupdate-0.5-9
  nodemanager-GITPATH           := git://git.verivue.com/planetlab/nodemanager@nodemanager-1.8-38
 -pyplnet-GITPATH                 := git://git.verivue.com/planetlab/pyplnet@pyplnet-4.3-12
 +pyplnet-GITPATH                 := git://git.verivue.com/planetlab/pyplnet@pyplnet-4.3-14
  codemux-GITPATH                 := git://git.verivue.com/planetlab/codemux.git@CoDemux-0.1-13
  iptables-BUILD-FROM-SRPM        := yes # tmp
  iptables-GITPATH                := git://git.verivue.com/planetlab/iptables.git@iptables-1.4.10-4

diff --cc module-tools.py
Simple merge