Merge with syslinux-3.3x
authorH. Peter Anvin <hpa@zytor.com>
Tue, 20 Feb 2007 00:26:52 +0000 (16:26 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 20 Feb 2007 00:26:52 +0000 (16:26 -0800)
1  2 
comboot.doc
comboot.inc

diff --cc comboot.doc
Simple merge
diff --cc comboot.inc
Simple merge