Commit from CentOS 5.9