Merge branch 'rhel6' of ssh://git.onelab.eu/git/linux-2.6 into rhel6