Merge with git+ssh://master.kernel.org/pub/scm/boot/syslinux/syslinux.git#syslinux...
authorH. Peter Anvin <hpa@zytor.com>
Tue, 17 Oct 2006 22:04:55 +0000 (15:04 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 17 Oct 2006 22:04:55 +0000 (15:04 -0700)

Trivial merge