Merge commit 'syslinux-3.83-pre1'
authorH. Peter Anvin <hpa@zytor.com>
Mon, 27 Jul 2009 18:15:43 +0000 (11:15 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 27 Jul 2009 18:15:43 +0000 (11:15 -0700)
commitf4b44a7b44faf9bcc345153f3ba23cabc68135da
tree657656b54205da14b85918142b2e0f9cdc027ba9
parent26f0dd1d698f332a9a095ba59e8ccbb633ce6a1f
parentaa2ebf33acd1b8a5942a062f4184f05745137219
Merge commit 'syslinux-3.83-pre1'

Conflicts:
com32/modules/chain.c

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