Merge remote branch 'origin/master' into pathbased syslinux-4.00-pre33
authorH. Peter Anvin <hpa@zytor.com>
Fri, 5 Mar 2010 19:22:52 +0000 (11:22 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 5 Mar 2010 19:22:52 +0000 (11:22 -0800)

Trivial merge