Merge branch 'rhel6' of ssh://git.planet-lab.org/git/linux-2.6 into rhel6

diff --combined kernel-2.6.spec
index fb4ba9c,3157cd9..f3a1f19
--- 1/kernel-2.6.spec
--- 2/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@@ -4,7 -4,7 +4,7 @@@
  Vendor: PlanetLab
  Packager: PlanetLab Central <support@planet-lab.org>
  Distribution: PlanetLab %{plrelease}
- URL: %(echo %{url} | cut -d ' ' -f 2)
+ URL: %{SCMURL}
  
  %{!?pldistro:%global pldistro planetlab}
  
@@@ -124,14 -124,8 +124,14 @@@ Summary: The Linux kerne
  %define with_perftool  %{?_without_perftool:  0} %{?!_without_perftool:  1}
  # perf noarch subpkg
  %define with_perf      %{?_without_perf:      0} %{?!_without_perf:      1}
 +#### Planet-Lab ####
  # kernel-debuginfo
 +%if "%{distro}" == "CentOS" && %{distrorelease} == 5
 +%define with_debuginfo %{?_without_debuginfo: 1} %{?!_without_debuginfo: 0}
 +%else
  %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}
 +%endif
 +#### Planet-Lab ####
  # kernel-bootwrapper (for creating zImages from kernel + initrd)
  %define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1}
  # Want to build a the vsdo directories installed