Merge commit 'syslinux-3.60' into gpxe-support
authorH. Peter Anvin <hpa@zytor.com>
Fri, 11 Jan 2008 07:01:09 +0000 (23:01 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 11 Jan 2008 07:01:09 +0000 (23:01 -0800)

Trivial merge