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

diff --cc onelab-k32-tags.mk
index 08235c8,78de7e7..ec9c0e6
--- 1/onelab-k32-tags.mk
--- 2/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@@ -2,12 -2,13 +2,13 @@@
  
  ###
  linux-2.6-BRANCH              := rhel6
- linux-2.6-GITPATH             := git://git.onelab.eu/linux-2.6.git@linux-2.6-32-9
+ linux-2.6-GITPATH             := git://git.onelab.eu/linux-2.6.git@rhel6
  # spec2make does not know how to interpret that
  #kernel-RPMFLAGS                      += --without debug
+ kernel-DEVEL-RPMS             += elfutils-libelf-devel
  madwifi-GITPATH                 := git://git.onelab.eu/madwifi.git@madwifi-4132-2
  iptables-BUILD-FROM-SRPM        := yes        # tmp
 -iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.9-1
 +iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.10-0
  iproute-BUILD-FROM-SRPM               := yes  
  iproute2-GITPATH              := git://git.onelab.eu/iproute2.git@iproute2-2.6.35-0
  ###

diff --cc planetlab-k32-tags.mk
index 7f69b88,5b36fc1..65ea053
--- 1/planetlab-k32-tags.mk
--- 2/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@@ -3,8 -3,9 +3,9 @@@
  mkinitrd-GITPATH              := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-0
  linux-2.6-BRANCH              := rhel6
  linux-2.6-GITPATH             := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-9
+ kernel-DEVEL-RPMS             += elfutils-libelf-devel
  madwifi-GITPATH                 := git://git.planet-lab.org/madwifi.git@madwifi-4132-2
 -iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.9-1
 +iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.10-0
  iptables-BUILD-FROM-SRPM := yes       # tmp
  iproute-BUILD-FROM-SRPM := yes        
  iproute2-GITPATH              := git://git.planet-lab.org/iproute2.git@iproute2-2.6.35-0