Merge remote-tracking branch 'origin/master' into elflink syslinux-5.00-pre4
authorH. Peter Anvin <hpa@zytor.com>
Fri, 22 Jun 2012 16:06:36 +0000 (09:06 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 22 Jun 2012 16:06:36 +0000 (09:06 -0700)

Trivial merge