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)

Trivial merge