Merge remote-tracking branch 'hdt/master' syslinux-4.06-pre4
authorH. Peter Anvin <hpa@zytor.com>
Sun, 27 May 2012 19:57:21 +0000 (12:57 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Sun, 27 May 2012 19:57:21 +0000 (12:57 -0700)
commita35dce33744f649fdbc0af0da664554cccaa8248
treef0a31d843379e324ad7d28b438cf0db927a7116f
parent0fa998ef1c083bfbd1ec6d57a2cacc7c46b1e63f
parent3857e1487f656fafb0aad778d38fc2beb3676435
Merge remote-tracking branch 'hdt/master'