Merge commit 'syslinux-3.55' into adv syslinux-3.60
authorH. Peter Anvin <hpa@zytor.com>
Fri, 11 Jan 2008 06:42:00 +0000 (22:42 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 11 Jan 2008 06:42:00 +0000 (22:42 -0800)

Trivial merge