Merge branch 'master' into i915res syslinux-3.85-pre61
authorH. Peter Anvin <hpa@zytor.com>
Sat, 23 Jan 2010 01:42:47 +0000 (17:42 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Sat, 23 Jan 2010 01:42:47 +0000 (17:42 -0800)

Trivial merge