Merged r8393:8398 from trunk to jh branch
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/jh/BOOK@8399 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689