Merge remote branch 'sha0/newness' syslinux-4.00
authorH. Peter Anvin <hpa@linux.intel.com>
Mon, 28 Jun 2010 21:42:11 +0000 (14:42 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Mon, 28 Jun 2010 21:42:11 +0000 (14:42 -0700)

Trivial merge