Merge branch 'syslinux-3.8x'
authorH. Peter Anvin <hpa@zytor.com>
Mon, 1 Jun 2009 04:53:53 +0000 (21:53 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 1 Jun 2009 04:53:53 +0000 (21:53 -0700)
commit327c0dadf173e09348b967746925e995b2b6dfaf
tree2ff03fe2003d39c24fcbe87390ef17785cee0c73
parent2f9949c8d0401557c9ca1679fb1d01948fb88b68
parentba03136d0d40bf219b4923855a3a2b20c03babd7
Merge branch 'syslinux-3.8x'

Conflicts:
NEWS