Merge commit 'syslinux-3.60-pre6' into gpxe-support
authorH. Peter Anvin <hpa@zytor.com>
Thu, 27 Dec 2007 00:31:51 +0000 (16:31 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 27 Dec 2007 00:31:51 +0000 (16:31 -0800)
commitd57dc289bdc3ccb39512abdc19c903c9e2522bc8
tree1b218027def26fd527fe594a6d25df99919dde39
parent0c734a31acc3a54514b978a64260ec3190338aa2
parent808b03603854aede50b7ebd09129053ab4025113
Merge commit 'syslinux-3.60-pre6' into gpxe-support

Conflicts:

NEWS
version
NEWS
pxelinux.asm