Merge commit 'origin/nodxax' into nolen

Conflicts:

	pxelinux.asm

diff --cc pxelinux.asm
index 94069b4,2f9a03e..1a43a0c
--- 1/pxelinux.asm
--- 2/pxelinux.asm
+++ b/pxelinux.asm
@@@ -1266,9 -1256,9 +1266,6 @@@ searchdir
                pop si                  ; We want the packet ptr in SI
  
                mov eax,[si+tftp_filesize]
-               mov edx,eax
-               shr edx,16              ; DX:AX == EAX
 -              cmp eax,-1
 -              jz .no_tsize
--
                and eax,eax             ; Set ZF depending on file size
                pop bp                  ; Junk
                pop bp                  ; Junk (retry counter)