Merge remote branch 'genec/rosh_for_hpa' syslinux-4.03-pre4
authorH. Peter Anvin <hpa@linux.intel.com>
Fri, 8 Oct 2010 20:46:26 +0000 (13:46 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 8 Oct 2010 20:46:26 +0000 (13:46 -0700)

Trivial merge