Merge to trunk r11060. Will have DJ hopefully take care of the rest.
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@11065 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689