Merge commit 'origin/gpxe-added' into gpxe-added syslinux-3.70-pre8
authorH. Peter Anvin <hpa@zytor.com>
Mon, 31 Mar 2008 12:29:08 +0000 (05:29 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 31 Mar 2008 12:29:08 +0000 (05:29 -0700)

Trivial merge