Merge branch 'chainload'
authorH. Peter Anvin <hpa@zytor.com>
Thu, 4 Feb 2010 00:06:21 +0000 (16:06 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 4 Feb 2010 00:06:21 +0000 (16:06 -0800)

Trivial merge