Ported r7357 and r7358 from trunk to alphabetical branch.
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/alphabetical/BOOK@7360 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689