Merged revisions 7155, 7156 to alphabetical branch
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/alphabetical/BOOK@7157 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689