Merge remote branch 'liu/master'syslinux-4.03-pre6
commit94fbd0b8d206102757cecd3dbd67cd701fb70470
authorH. Peter Anvin <hpa@linux.intel.com>
Fri, 15 Oct 2010 23:41:02 +0000 (15 16:41 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 15 Oct 2010 23:41:02 +0000 (15 16:41 -0700)
tree985134a429fc1bd82d9036dc1400140271ae7639
parent7634709500bc97448244a46a06621273d0cac9cc
parenta66a47e168804aa0a62a3a5810d7f8dd9b647dab
Merge remote branch 'liu/master'