Merge commit 'syslinux-4.04-pre22' into dynamic-sector
authorH. Peter Anvin <hpa@linux.intel.com>
Tue, 5 Apr 2011 20:58:30 +0000 (13:58 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Tue, 5 Apr 2011 20:58:30 +0000 (13:58 -0700)
1  2 
core/diskstart.inc

Simple merge