Update from rhel5-branch.