Merge from Etherboot 5.4

diff --cc src/proto/nfs.c
index 2d83789757606ce3410498fd42ac19d88ba4c183,2d83789757606ce3410498fd42ac19d88ba4c183..311409a6b0bc6b6e1537b595bcd066839ff96f7d
--- 1/src/proto/nfs.c
--- 2/src/proto/nfs.c
+++ b/src/proto/nfs.c
@@@ -575,7 -575,7 +575,7 @@@ nfssymlink
                        return 0;
                }
                if (err) {
--                      printf("reading at offset %d: ", offs);
++                      printf("\nError reading at offset %d: ", offs);
                        nfs_printerror(err);
                        nfs_reset();
                        return 0;