Merge commit 'syslinux-4.04-pre18' into elflink
commit844e965443e08133a7a366a496d8cc52ef93ca48
authorH. Peter Anvin <hpa@linux.intel.com>
Mon, 4 Apr 2011 21:12:08 +0000 (4 14:12 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Mon, 4 Apr 2011 21:12:08 +0000 (4 14:12 -0700)
tree5d305e467fca8af8af56dc409968663d54d7838c
parent57a2f144f7c1aec07a66ecff4c71deec1f1d17ee
parentdd94414a8ecbae130f62143c43fe0001a74653ff
Merge commit 'syslinux-4.04-pre18' into elflink