Merge with git+ssh://master.kernel.org/pub/scm/boot/syslinux/syslinux.git
authorH. Peter Anvin <hpa@zytor.com>
Thu, 17 Aug 2006 22:32:48 +0000 (15:32 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 17 Aug 2006 22:32:48 +0000 (15:32 -0700)

Trivial merge