Merge commit 'origin/gpxe-support' into gpxe-added
authorH. Peter Anvin <hpa@zytor.com>
Sat, 29 Mar 2008 05:20:26 +0000 (22:20 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Sat, 29 Mar 2008 05:20:26 +0000 (22:20 -0700)

Trivial merge