* master:
src/jobclient.c: Cope if the jobserver pipe is set nonblocking.
bin/chroot-maint: Force `--no-merged-usr'.
bin/chroot-maint: Update the path correctly when following a symlink.
bin/chroot-maint: Don't forget to copy symlinks to directories.