Merge branch 'master' of /pub/scm/gpxe

diff --cc src/arch/i386/Makefile
index bda22c8,21a8e36..620cddd
--- 1/src/arch/i386/Makefile
--- 2/src/arch/i386/Makefile
+++ b/src/arch/i386/Makefile
@@@ -111,9 -111,15 +111,15 @@@ NON_AUTO_MEDIA           += fd
        dd if=$< bs=512 conv=sync of=/dev/fd0
        sync
  
+ # rule to create padded disk images
+ NON_AUTO_MEDIA                += pdsk
+ %pdsk : %dsk
+       cp $< $@
+       $(PERL) ./util/dskpad.pl $@
+ 
  # rule to make a non-emulation ISO boot image
  NON_AUTO_MEDIA                += iso
 -%iso: %lilo util/geniso
 +%iso: %lkrn util/geniso
        ISOLINUX_BIN=$(ISOLINUX_BIN) bash util/geniso $@ $<
  
  # rule to make a floppy emulation ISO boot image