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)
commit807daf17104cc9477de0fedfec798663c299b150
tree8b00a8d3e17cd7460047cfa478445233a4b1e8fd
parent26798641567f3057d2a910de2a767bb810815774
parentbbea484cccaba57839e83a20c64b00209865c9a8
Merge branch 'syslinux-3.7x'

Conflicts:
version