Reprise of r6318. (merged from trunk r6334)
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.1/BOOK@6338 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689