Merge with syslinux-3.35 syslinux-3.40-pre4
authorH. Peter Anvin <hpa@zytor.com>
Mon, 29 Jan 2007 02:41:56 +0000 (18:41 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 29 Jan 2007 02:41:56 +0000 (18:41 -0800)
commit1970446f95df5ac0a0d3b2b0e90b72e0dd353699
tree72f02e5c97af6a030e9fdead246f5ecae9f7532f
parent5c2c8ff329b1ae29edc2490bd44c42ada067a123
parentaa4b75f7257966f14940848366fa16087debe820
Merge with syslinux-3.35

Conflicts:

NEWS
version
NEWS
comboot.doc
comboot.inc
isolinux.asm
ldlinux.asm
syslinux.doc
ui.inc