Merge branch 'syslinux-3.7x'
authorH. Peter Anvin <hpa@zytor.com>
Thu, 16 Apr 2009 18:04:52 +0000 (11:04 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 16 Apr 2009 18:04:52 +0000 (11:04 -0700)

Trivial merge