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