Merge branch 'syslinux-3.8x'
authorH. Peter Anvin <hpa@zytor.com>
Mon, 1 Jun 2009 04:53:53 +0000 (21:53 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 1 Jun 2009 04:53:53 +0000 (21:53 -0700)
Conflicts:
NEWS


Trivial merge