Merge commit 'syslinux-3.63' into gpxe-added syslinux-3.70-pre9
authorH. Peter Anvin <hpa@zytor.com>
Thu, 10 Apr 2008 17:41:32 +0000 (10:41 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 10 Apr 2008 17:41:32 +0000 (10:41 -0700)
commit6699cb66d4456f2d61b3ac3f8d14ce81df2437eb
treeed176fcd3d62d9d3d11f6b587e55edffc17f5505
parentd0f8f5f7d260f05292a3bc947e7cef40dc73b415
parent0f3565349c5ae16f213fa5d971a8d264782779da
Merge commit 'syslinux-3.63' into gpxe-added

Conflicts:

NEWS
com32/modules/Makefile
NEWS
com32/modules/Makefile
extlinux.asm