Merge branch 'syslinux-3.7x'
authorH. Peter Anvin <hpa@zytor.com>
Mon, 27 Apr 2009 02:36:58 +0000 (19:36 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 27 Apr 2009 02:36:58 +0000 (19:36 -0700)
Conflicts:
version


Trivial merge