Merge branch 'syslinux-3.7x'
authorH. Peter Anvin <hpa@linux.intel.com>
Tue, 14 Apr 2009 18:27:25 +0000 (11:27 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Tue, 14 Apr 2009 18:27:25 +0000 (11:27 -0700)
commitbc6a65ac83d9d8c53076bf90a846f95210fa3736
treea9c276023fb4b5fa00116e08ef37801a5930c9ef
parent911dd342742a50867fc1bd7c4fc3a3285696431d
parentd05f79f204be71f7e60137b0cdc7bd69d30b7109
Merge branch 'syslinux-3.7x'

Conflicts:
core/bootsect.inc
version

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
core/bootsect.inc
core/pxelinux.asm
core/runkernel.inc
core/ui.inc