Merge branch 'syslinux-3.7x'
authorH. Peter Anvin <hpa@linux.intel.com>
Tue, 14 Apr 2009 19:14:04 +0000 (12:14 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Tue, 14 Apr 2009 19:14:04 +0000 (12:14 -0700)

Trivial merge