Merge commit 'syslinux-3.84'
authorH. Peter Anvin <hpa@zytor.com>
Tue, 22 Dec 2009 17:45:59 +0000 (09:45 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 22 Dec 2009 17:45:59 +0000 (09:45 -0800)
commit9e25d6029b8c1568a74a7d9b5bc07f22b0fb8ade
tree5804b971440fca843ae7c6fbe96db70d2f506291
parent2b164fd1078bc9640836f15598ed901cc7a31ae2
parent6c7159d13c948afcc067635d0cc0c6aae39a04bf
Merge commit 'syslinux-3.84'

Resolved Conflicts:
Makefile

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Makefile
com32/lib/Makefile