Merged r7068 to 6.1.1.
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.1.1/BOOK@7069 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689