Merge branch 'master' into i915res syslinux-3.85-pre62
authorH. Peter Anvin <hpa@zytor.com>
Thu, 4 Feb 2010 00:06:41 +0000 (16:06 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 4 Feb 2010 00:06:41 +0000 (16:06 -0800)

Trivial merge