Move merge branch to trunk

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11081 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689