Merge with git+ssh://master.kernel.org/pub/scm/boot/syslinux/syslinux.git#syslinux... syslinux-3.36-pre7
authorH. Peter Anvin <hpa@zytor.com>
Thu, 8 Feb 2007 17:58:24 +0000 (09:58 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 8 Feb 2007 17:58:24 +0000 (09:58 -0800)

Trivial merge