Merge commit 'syslinux-3.82'
authorH. Peter Anvin <hpa@zytor.com>
Tue, 9 Jun 2009 17:49:31 +0000 (10:49 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 9 Jun 2009 17:49:31 +0000 (10:49 -0700)
commit78edf2be58fd9106af088b8a2b09fca1d41e1dfa
treedd59483bfaefe428f0794cb1e4f20ba795366b15
parent69bb4b204e8d29c89597961e94807d1acba2cd4b
parent38e1c74db64e02152e525c2d5c135cb5793d847e
Merge commit 'syslinux-3.82'

Conflicts:
com32/menu/menumain.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
com32/menu/menumain.c