Merge commit 'syslinux-4.04-pre18' into elflink
authorH. Peter Anvin <hpa@linux.intel.com>
Mon, 4 Apr 2011 21:12:08 +0000 (14:12 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Mon, 4 Apr 2011 21:12:08 +0000 (14:12 -0700)

Trivial merge